Merge branch 'develop' into operations_service
authormasensio <masensio@solidgear.es>
Mon, 7 Apr 2014 06:49:01 +0000 (08:49 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Apr 2014 06:49:01 +0000 (08:49 +0200)

Trivial merge