Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 08:20:45 +0000 (09:20 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Feb 2014 08:20:45 +0000 (09:20 +0100)

Trivial merge