Merge remote-tracking branch 'origin/add_cookie_based_session_support' into add_cooki...
authormasensio <masensio@solidgear.es>
Tue, 10 Jun 2014 11:01:11 +0000 (13:01 +0200)
committermasensio <masensio@solidgear.es>
Tue, 10 Jun 2014 11:01:11 +0000 (13:01 +0200)

Trivial merge