Merge branch 'develop' into refactor_remote_operation_to_read_file
authormasensio <masensio@solidgear.es>
Mon, 16 Dec 2013 09:52:48 +0000 (10:52 +0100)
committermasensio <masensio@solidgear.es>
Mon, 16 Dec 2013 09:52:48 +0000 (10:52 +0100)

Trivial merge