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

[Ding-Yi Chen]

commit 2fcb682dfbc5cc8b30112f1781c97c00bd57a7e0
Merge: ac8d181 ff21602
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Aug 27 10:37:14 2014 +1000

    Merge branch 'master' into el5

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