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
..
controllers	Merge branch 'master' into unstable	2011-12-01 17:46:05 +01:00
drops	[#604] Add an IssueDrop with custom field support	2011-11-20 02:49:12 +01:00
helpers	Merge branch 'master' into unstable	2011-12-01 17:46:05 +01:00
models	Merge branch 'master' into unstable	2011-12-01 17:46:05 +01:00
views	Merge branch 'master' into unstable	2011-12-01 17:46:05 +01:00