Merge remote branch 'remotes/origin/drzb2013v2' into drzb2013v2
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 8 Jan 2013 12:58:42 +0000 (13:58 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 8 Jan 2013 12:58:42 +0000 (13:58 +0100)
Conflicts:
app/en/partials/registration.html


Trivial merge