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

[Ding-Yi Chen]

commit 1286655feb91b7ab5cb5e38dd08afd20cd3481aa
Merge: 6b9ed09 ad9636a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Nov 27 07:14:28 2013 +1000

    Merge branch 'master' into el5

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