Merge branch 'master' into openid

Conflicts:
	config/locales/en.yml
This commit is contained in:
Tom Hughes 2011-05-31 19:10:31 +01:00
commit 652dbf5044
157 changed files with 16429 additions and 11558 deletions

View file

@ -1,9 +1,4 @@
module I18n
original_verbosity = $VERBOSE
$VERBOSE = nil
INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/
$VERBOSE = original_verbosity
module Backend
class Simple
module Implementation