[python-elixir/epel7: 5/5] Merge branch 'master' into epel7

[Dan Callaghan]

commit 26ca7805f0642794c42be67daee1df39cd9d47d8
Merge: ddf62c9 d29dfde
Author: Dan Callaghan <dcallagh at redhat.com>
Date:   Thu Aug 21 09:18:30 2014 +1000

    Merge branch 'master' into epel7

 python-elixir-aes-encryption-addition.patch |   82 +++++++++++++++++++++++++++
 python-elixir.spec                          |   15 +++++-
 2 files changed, 96 insertions(+), 1 deletions(-)
---