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

[Ding-Yi Chen]

commit 488b1c291310c4b5fc8201eb9161ee748880b7fe
Merge: 71454b1 5b88016
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 26 12:54:26 2013 +1000

    Merge branch 'master' into el6

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