commit 23527cd1bd05b538cb923f8496cb545af2d6b238 Merge: 1286655 b18827c Author: Ding-Yi Chen <dingyichen at gmail.com> Date: Wed Nov 27 10:54:18 2013 +1000 Merge branch 'master' into el5 .gitignore | 1 + cmake-fedora.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---