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)
commitc1df34b5e38a671c7cd57aa223a5251812e84824
tree99d5e54a4aad422b908bd890fe0d4e5221e3dabc
parentd535c420f2e04f399d1abbd88b497b0b98bc4494
parent8f5ab8df08f513bbc52ed9098cdbf839037b2e4b
Merge remote-tracking branch 'origin/operations_service' into operations_service