Merge branch 'develop' into check_server_version
authormasensio <masensio@solidgear.es>
Thu, 27 Mar 2014 09:05:59 +0000 (10:05 +0100)
committermasensio <masensio@solidgear.es>
Thu, 27 Mar 2014 09:05:59 +0000 (10:05 +0100)

Trivial merge