[cmake-fedora/epel7: 5/5] Merge branch 'master' into epel7

[Ding-Yi Chen]

commit cc6e1f98f71c052fa51bc9626f7656a1fc2c1317
Merge: 10143c8 db80b84
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 26 15:17:45 2014 +1000

    Merge branch 'master' into epel7

 .gitignore        |    4 ++--
 cmake-fedora.spec |   16 +++++++++++++++-
 sources           |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)
---