Eric Davis bdc7325a82 Merge branch 'master' into unstable ... Conflicts: doc/CHANGELOG.rdoc		2011-05-01 13:58:02 -07:00
..
CHANGELOG.rdoc	Merge branch 'master' into unstable	2011-05-01 13:58:02 -07:00
COPYING.rdoc	[211] Rename doc files to rdoc	2011-02-26 13:28:33 -08:00
COPYRIGHT.rdoc	[#211] Added a GPL based Copyright file	2011-02-27 10:57:10 -08:00
INSTALL.rdoc	[#211] Updating rdoc documentation	2011-02-26 13:41:32 -08:00
RUNNING_TESTS.rdoc	[#211] Updating rdoc documentation	2011-02-26 13:41:32 -08:00
UPGRADING.rdoc	[#211] Updating rdoc documentation	2011-02-26 13:41:32 -08:00