[libtorrent/el6: 19/19] Merge branch 'master' into el6

[verdurin]

commit 532ab25c766a305b614050b8bc2ee9f75ac6755b
Merge: e3de5df 7128e38
Author: Adam Huffman <verdurin at fedoraproject.org>
Date:   Tue Aug 12 22:55:42 2014 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	libtorrent.spec
    	sources

 .gitignore               |    8 +
 libtorrent-aarch64.patch |  360 ++++++++++++++++++++++++++++++++++++++++++++++
 libtorrent.spec          |   57 +++++++-
 sources                  |    2 +-
 4 files changed, 422 insertions(+), 5 deletions(-)
---