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

[Ding-Yi Chen]

commit afb395b381069c3658b93744c30ba0cf0079edb6
Merge: 6f56b81 ff21602
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Aug 27 09:41:17 2014 +1000

    Merge branch 'master' into f19

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