Holger Just 1eefd4b40d Merge branch 'master' into unstable ...

Conflicts:
	app/models/journal_observer.rb
	lib/chili_project/version.rb
	test/unit/principal_drop_test.rb

2012-02-06 23:57:10 +01:00

..

CHANGELOG.rdoc

Merge branch 'master' into unstable

2012-02-06 23:57:10 +01:00

COPYING.rdoc

[211] Rename doc files to rdoc

2011-02-26 13:28:33 -08:00

COPYRIGHT_short.rdoc

Update copyright for 2012

2012-01-03 20:36:40 +01:00

COPYRIGHT.rdoc

Update copyright for 2012

2012-01-03 20:36:40 +01:00

INSTALL.rdoc

[#211] Updating rdoc documentation

2011-02-26 13:41:32 -08:00

RUNNING_TESTS.rdoc

Update RUNNING_TESTS.rdoc to point to a wiki page

2011-05-29 17:42:49 -07:00

UPGRADING.rdoc

[#211] Updating rdoc documentation

2011-02-26 13:41:32 -08:00