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

[Ding-Yi Chen]

commit 71454b1dc7be5be857a65ffb7e61f233b659081d
Merge: c34b613 6d72a21
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 25 15:59:25 2013 +1000

    Merge branch 'master' into el6

 .gitignore        |    2 +
 cmake-fedora.spec |   89 +++++++++++++++++++++++++++++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 80 insertions(+), 13 deletions(-)
---