Merge branch 'develop' into refactor_remote_operation_to_read_folder
authormasensio <masensio@solidgear.es>
Mon, 25 Nov 2013 12:03:57 +0000 (13:03 +0100)
committermasensio <masensio@solidgear.es>
Mon, 25 Nov 2013 12:03:57 +0000 (13:03 +0100)

Trivial merge