[tito/el5: 2/2] Merge branch 'master' into el5

[Devan Goodwin]

commit 99a2dfa8f30e1ce5820d0604e29cd0eb0871a8e0
Merge: dc1bb8f 49782cf
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri May 16 13:07:11 2014 -0300

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 tito.spec  |    8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---