[cgnslib/f20: 2/2] Merge branch 'master' into f20

[Christopher Meng]

commit 502c2a08970610e12bc1ece84e442c3f751e61a6
Merge: 9bc0120 f993c33
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 2 14:09:44 2014 +0800

    Merge branch 'master' into f20

 cgnslib.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---