Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Mon, 3 Mar 2014 07:46:26 +0000 (08:46 +0100)
committermasensio <masensio@solidgear.es>
Mon, 3 Mar 2014 07:46:26 +0000 (08:46 +0100)

Trivial merge