Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Tue, 25 Feb 2014 10:12:48 +0000 (11:12 +0100)
committermasensio <masensio@solidgear.es>
Tue, 25 Feb 2014 10:12:48 +0000 (11:12 +0100)

Trivial merge