Merge remote-tracking branch 'origin/refactor_remote_operation_to_read_file' into...
authormasensio <masensio@solidgear.es>
Tue, 7 Jan 2014 09:18:02 +0000 (10:18 +0100)
committermasensio <masensio@solidgear.es>
Tue, 7 Jan 2014 09:18:02 +0000 (10:18 +0100)

Trivial merge