Hannah Wolfe 4e1b5a8e09 Manually merging pull request #439 from javorszky/iss354 ... Conflicts: core/client/views/login.js		2013-08-20 10:11:09 +01:00
..
admin	Manually merging pull request #439 from javorszky/iss354	2013-08-20 10:11:09 +01:00