Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Tue, 18 Feb 2014 09:32:28 +0000 (10:32 +0100)
committermasensio <masensio@solidgear.es>
Tue, 18 Feb 2014 09:32:28 +0000 (10:32 +0100)

Trivial merge