Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Wed, 26 Feb 2014 09:15:37 +0000 (10:15 +0100)
committermasensio <masensio@solidgear.es>
Wed, 26 Feb 2014 09:15:37 +0000 (10:15 +0100)

Trivial merge