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

[Devan Goodwin]

commit 7da8cf5b80e9cf513b97ff800859485d2c5eb21a
Merge: 05c3d2c e02bd3e
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri May 9 13:57:39 2014 -0300

    Merge branch 'master' into el5

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