Merge branch 'develop' into refactor_remote_operation_to_download_file
authormasensio <masensio@solidgear.es>
Wed, 11 Dec 2013 08:38:13 +0000 (09:38 +0100)
committermasensio <masensio@solidgear.es>
Wed, 11 Dec 2013 08:38:13 +0000 (09:38 +0100)

Trivial merge