[ccache/el6: 4/4] Merge branch 'master' into el6

[Ville Skyttä]

commit 6d987f16b89491213021b93773fa989e57836e96
Merge: 9bfd19d 98ad636
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Dec 18 00:07:22 2011 +0200

    Merge branch 'master' into el6

 .gitignore    |    2 +-
 ccache.csh.in |    2 ++
 ccache.sh.in  |    2 ++
 ccache.spec   |   13 +++++++++++--
 sources       |    2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
---