Merge branch 'develop' into add_cookie_based_session_support
authormasensio <masensio@solidgear.es>
Mon, 9 Jun 2014 09:48:07 +0000 (11:48 +0200)
committermasensio <masensio@solidgear.es>
Mon, 9 Jun 2014 09:48:07 +0000 (11:48 +0200)
commit48872989d72ff8bc88932c39a55d22aea425ced6
tree25f08b66b0b6f552d36dc30b9fed859dad012b0b
parent01a610360e898e6d33e4162b45f3e52771e56d53
parentd152a97a6721113f4fdf50c6524f44b0da3d1112
Merge branch 'develop' into add_cookie_based_session_support