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

[Devan Goodwin]

commit 7e597c0290077225db4425fda472f1c75d9cdbdd
Merge: c0fd9f7 391c42c
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Mon May 12 08:54:33 2014 -0300

    Merge branch 'master' into el6

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