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

[Ding-Yi Chen]

commit e37b1f9075052f28bde7e7b30a9a3ca415d10153
Merge: ce19676 ad9636a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Nov 27 07:03:33 2013 +1000

    Merge branch 'master' into el6

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