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

[Ding-Yi Chen]

commit e66ae36d44becf206c52b02d57948b4c32428122
Merge: d2bdae4 ff21602
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Aug 26 18:19:30 2014 +1000

    Merge branch 'master' into f21

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