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)

Trivial merge