Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Tue, 14 Jan 2014 10:12:31 +0000 (11:12 +0100)
committermasensio <masensio@solidgear.es>
Tue, 14 Jan 2014 10:12:31 +0000 (11:12 +0100)
commitb5ca58b712f9404d0afa00a7915ec183fa3ea29a
treec30c68096fca4feea6a843f8bad41a395d250d65
parent8f0128cbab3127d64493beb7ba8c817fabc2e1b5
parentbd5f59d3762ec7de779ec4944b149acdf7222190
Merge branch 'develop' into refactor_remote_saml_authentication