From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 8 Jan 2013 12:58:42 +0000 (+0100)
Subject: Merge remote branch 'remotes/origin/drzb2013v2' into drzb2013v2
X-Git-Tag: 0.4~35
X-Git-Url: http://git.rot13.org/?p=angular-drzb;a=commitdiff_plain;h=56f0d47a534142c3a7ce89dd692911a053591283

Merge remote branch 'remotes/origin/drzb2013v2' into drzb2013v2

Conflicts:
	app/en/partials/registration.html
---

56f0d47a534142c3a7ce89dd692911a053591283