[cmake-fedora/el6: 2/2] Merge branch 'master' into el6

[Ding-Yi Chen]

commit b772dfd060fdc374f147b870506c14d91e54a96a
Merge: a95ae2f ff21602
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Aug 27 10:30:41 2014 +1000

    Merge branch 'master' into el6

 .gitignore        |    1 +
 cmake-fedora.spec |    7 ++++---
 sources           |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
---