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

[Ding-Yi Chen]

commit 48120b4519af2030c66bba4b47a0af4af85a558b
Merge: e37b1f9 b18827c
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Nov 27 10:44:28 2013 +1000

    Merge branch 'master' into el6

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