Merge branch 'tupshin-master'
Merge branch 'master' of github.com:rustyrazorblade/rust-memcached
Merge branch 'master' of github.com:rustyrazorblade/rust-memcached