Merge lp:~tangent-org/gearmand/1.0 Build: jenkins-Gearmand-381