Merge branch 'develop' into more_concrete_error_messages_session_expires
authormasensio <masensio@solidgear.es>
Mon, 26 May 2014 06:52:38 +0000 (08:52 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 May 2014 06:52:38 +0000 (08:52 +0200)

Trivial merge