Merge remote-tracking branch 'origin/operations_service' into operations_service
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 4 Apr 2014 12:19:05 +0000 (14:19 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 4 Apr 2014 12:19:05 +0000 (14:19 +0200)

Trivial merge