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

[Devan Goodwin]

commit ac7e2151b32c55a50fafd15c3b99b90846ffa301
Merge: 0cd64d6 49782cf
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri May 16 13:07:30 2014 -0300

    Merge branch 'master' into el6

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