Merge branch 'develop' into refactor_remote_operation_to_read_file
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 13 Dec 2013 08:45:40 +0000 (09:45 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 13 Dec 2013 08:45:40 +0000 (09:45 +0100)

Trivial merge