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

[Ding-Yi Chen]

commit ce196769945d4a3d1ff31b031268e189e4719c60
Merge: 488b1c2 7fc2f77
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Nov 26 23:42:34 2013 +1000

    Merge branch 'master' into el6

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