Sven Fuchs 300e91133c Merge branch 'master' into sf-log ... Conflicts: assets/scripts/app/views/log.coffee		2013-03-22 02:14:55 +01:00
..
ext	change I18n.missingTranslation so that we use the last part of the key, titleized instead of a phat, ugly monster message	2012-11-22 16:24:40 +01:00
travis	Merge branch 'master' into sf-log	2013-03-22 02:14:55 +01:00