Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Thu, 28 Mar 2013 00:36:07 +0000 (00:36 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Mar 2013 00:36:07 +0000 (00:36 +0000)
commit898cc828dd1f1167f85abbf35c8e3f0ed640ac1e
treeb033f83951273ec7199d61d7a466cf99feb99f80
parent38255f9f8d7363b51350338fdda5753647aca1af
parentd53bbe53f48d3f235ebc93af665ac912c057a51b
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
Gemfile
Gemfile.lock
app/models/user.rb
config/locales/de.yml
config/locales/en.yml