[ast/epel7: 8/8] Merge branch 'master' into epel7

[Orion Poplawski]

commit 5fe9934d9e60f43f736fa72678d3f67b45eeb56a
Merge: 859a01f 931ff7a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jan 21 22:01:14 2014 -0700

    Merge branch 'master' into epel7

 .gitignore     |    3 +
 ast-libs.patch |  661 +-------------------------------------------------------
 ast.spec       |   19 ++-
 sources        |    2 +-
 4 files changed, 29 insertions(+), 656 deletions(-)
---