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)
commit56f0d47a534142c3a7ce89dd692911a053591283
tree7192d9da9137b7805bff6c49b1afb1a18509981b
parent0cd637d5ba96f0890c2eb22b24d455ddff254a34
parent6e79b7ce42eb44881917ae557ddbd7e4e75a1d3c
Merge remote branch 'remotes/origin/drzb2013v2' into drzb2013v2

Conflicts:
app/en/partials/registration.html