Merge git://git.code.sf.net/u/xophmeister/fuse

diff --cc ChangeLog
index a0c241932a54eaf6ec61099dda9fb75a05259f71,4c0d87da423a97cc052f04c1d34424fae3f54f36..5b39f160a36c89d8e4ccbf5d7ceb2bc02a6b0b84
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,11 @@@
  2015-08-12  Miklos Szeredi <miklos@szeredi.hu>
  
 +      * libfuse: fix warning mount.c:receive_fd().  Reported by Albert
 +      Berger
 +
+       * libfuse: added fuse_pkgversion() function to retrieve the full
+       version string, per autoconf.  Patch by Christopher Harrison
+ 
  2015-06-29  Miklos Szeredi <miklos@szeredi.hu>
  
        * libfuse: fix possible memory leak.  Reported by Jose R. Guzman