[travelccm/el5: 15/16] Merge branch 'el6' into el5

[Denis Arnaud]

commit dc3ae09b1bfc761235cf55b036358e32d95a87e6
Merge: 0ab7ef7 112375e
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Tue Dec 25 14:32:38 2012 +0100

    Merge branch 'el6' into el5

 .gitignore     |   12 ++++++------
 sources        |    2 +-
 travelccm.spec |    5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)
---