Merge branch 'develop' into refactor_remote_operation_to_download_file
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 13 Dec 2013 12:25:12 +0000 (13:25 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 13 Dec 2013 12:25:12 +0000 (13:25 +0100)

Trivial merge