[cmake-fedora/f21: 5/5] Merge branch 'master' into f21

[Ding-Yi Chen]

commit d2bdae4883b0016c311a731e3b1b2bd7f8b460c3
Merge: 10143c8 db80b84
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 26 15:16:27 2014 +1000

    Merge branch 'master' into f21

 .gitignore        |    4 ++--
 cmake-fedora.spec |   16 +++++++++++++++-
 sources           |    2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)
---