Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Fri, 28 Feb 2014 07:30:54 +0000 (08:30 +0100)
committermasensio <masensio@solidgear.es>
Fri, 28 Feb 2014 07:30:54 +0000 (08:30 +0100)

Trivial merge