[abi-compliance-checker/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Orion Poplawski]

commit f6bf88ff0dc60b839a66f26228d940974934175c
Merge: dd7fc9d 1b6f669
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Jun 10 09:17:01 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6

 .gitignore                  |    1 +
 abi-compliance-checker.spec |    5 ++++-
 sources                     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---