Merge lp:~brianaker/libmemcached/feature-server_timeout Build: jenkins-Libmemcached-450
authorContinuous Integration <ci@tangent.org>
Wed, 5 Feb 2014 00:02:35 +0000 (16:02 -0800)
committerContinuous Integration <ci@tangent.org>
Wed, 5 Feb 2014 00:02:35 +0000 (16:02 -0800)

Trivial merge