Merge.

diff --cc include/memcached.h
Simple merge

diff --cc lib/memcached_version.c
index 7cb65e564c4ce8426ef268bad2e20a8bce80859d,f4a04d7d233b422ed8979f4ba1a4f14f63d9ea48..e49d76f0b2e87c8e510ed5e74025f6edc0aa98b8
--- 1/lib/memcached_version.c
--- 2/lib/memcached_version.c
+++ b/lib/memcached_version.c
@@@ -1,5 -1,9 +1,10 @@@
  #include "common.h"
  
 -const char * memcached_lib_version(void) {
++const char * memcached_lib_version(void) 
++{
+   return LIBMEMCACHED_VERSION_STRING;
+ }
+ 
  memcached_return memcached_version(memcached_st *ptr)
  {
    unsigned int x;