Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
..
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00
2011-10-29 14:48:03 +02:00