Tom Hughes dc35b597a2 Merge branch 'master' into openid ... Conflicts: config/locales/is.yml		2010-06-07 22:24:24 +01:00
..
gems	Add missing specification file to ROTS gem	2010-05-17 00:27:11 +01: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	2010-06-07 22:24:24 +01:00