[pyxattr/f21: 3/3] Merge branch 'master' into f21

[Marcin Zajaczkowski]

commit 0efe0c2ab2392de5a0d8afa23a020ba17d18e947
Merge: b005d03 3699be0
Author: Marcin Zajaczkowski <szpak at users.sourceforge.net>
Date:   Thu Aug 7 11:34:13 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	pyxattr.spec

 0001-use-Py_ssize_t.patch |  127 +++++++++++++++++++++++++++++++++++++++++++++
 pyxattr.spec              |   11 ++--
 2 files changed, 133 insertions(+), 5 deletions(-)
---