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

[Ding-Yi Chen]

commit 6b9ed09f64e24cf52827d0157597cf9ef30487b7
Merge: 16e653f 7fc2f77
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 26 23:54:01 2013 +1000

    Merge branch 'master' into el5

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