Merge branch 'develop' into add_cookie_based_session_support
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Jun 2014 16:16:58 +0000 (18:16 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Jun 2014 16:16:58 +0000 (18:16 +0200)
commitc9e756b05bef25c90c87fbdf91dc266b978323f0
tree23474bf07ebff0a977149ea73ebad6e0633e46b3
parent1f542cc465daa53d57ff3b7343b9a18b13a4400c
parentedb8c54e3fbdcdcefa9a0b86071b8d7aa2b9b2c5
Merge branch 'develop' into add_cookie_based_session_support