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)
commitf849570b0aed0d06e416a915949324e72da0ea85
tree187631231bf2db7028090cd3e3df2911c5bf7d10
parent121887c8991ce7184d7bdfcd22efbbf85dafc236
parentf6fec8bfddfa288c7df584362d24c86ade8b54f9
Merge branch 'develop' into more_concrete_error_messages_session_expires