[bindfs/el6: 15/15] Merge branch 'master' into el6

[Till Maas]

commit 86b1d5ad6f4979c70121651c9fffdf401a830630
Merge: 8d7733c 9bfba76
Author: Till Maas <opensource at till.name>
Date:   Mon Nov 3 19:14:29 2014 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore  |    2 +-
 bindfs.spec |   52 ++++++++++++++++++++++++++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 48 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index f91b32d,5fd5798..cd9ac56
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,1 @@@
- bindfs-1.8.3.tar.gz
 -/bindfs-1.11.tar.gz
 -/bindfs-1.12.2.tar.gz
 -/bindfs-1.12.3.tar.gz
 -/bindfs-1.12.4.tar.gz
 -/bindfs-1.12.6.tar.gz
++bindfs-1.12.6.tar.gz