Merge branch 'develop' into refactor_remote_operation_to_read_folder
authormasensio <masensio@solidgear.es>
Thu, 28 Nov 2013 13:17:06 +0000 (14:17 +0100)
committermasensio <masensio@solidgear.es>
Thu, 28 Nov 2013 13:17:06 +0000 (14:17 +0100)

Trivial merge