Merge branch 'develop' into refactor_remote_operation_to_download_file
authormasensio <masensio@solidgear.es>
Tue, 17 Dec 2013 07:30:09 +0000 (08:30 +0100)
committermasensio <masensio@solidgear.es>
Tue, 17 Dec 2013 07:30:09 +0000 (08:30 +0100)

Trivial merge