Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page ... Conflicts: CHANGELOG		2014-04-07 20:13:37 +02:00
..
confirmations	…
mailer	…
passwords	…
registrations	…
sessions	Merge branch 'master' into login_page	2014-04-07 20:13:37 +02:00
shared	…
unlocks	…