Merge remote-tracking branch 'origin/operations_service' into operations_service
authormasensio <masensio@solidgear.es>
Fri, 4 Apr 2014 12:50:46 +0000 (14:50 +0200)
committermasensio <masensio@solidgear.es>
Fri, 4 Apr 2014 12:50:46 +0000 (14:50 +0200)

Trivial merge