Merge branch 'develop' into refactor_remote_operation_to_download_file
authormasensio <masensio@solidgear.es>
Thu, 5 Dec 2013 16:37:40 +0000 (17:37 +0100)
committermasensio <masensio@solidgear.es>
Thu, 5 Dec 2013 16:37:40 +0000 (17:37 +0100)

Trivial merge