Merge remote-tracking branch 'origin/develop' into refactor_remote_operation_to_read_...
authormasensio <masensio@solidgear.es>
Tue, 26 Nov 2013 08:33:12 +0000 (09:33 +0100)
committermasensio <masensio@solidgear.es>
Tue, 26 Nov 2013 08:33:12 +0000 (09:33 +0100)

Trivial merge