Tom Hughes 652dbf5044 Merge branch 'master' into openid ... Conflicts: config/locales/en.yml		2011-05-31 19:10:31 +01:00
..
gems	Disable logging when --silent is used	2010-12-05 16:20:59 +00:00
generators/daemon	Import the daemon generator as the SVN external never works.	2008-08-07 17:46:34 +00:00
plugins	Merge branch 'master' into openid	2011-05-31 19:10:31 +01:00