[json-c/f21: 2/2] Merge branch 'master' into f21

[Christopher Meng]

commit 4720716e0fb98d7c1cc24d01742d5b18bb53c786
Merge: faf7a71 dbac01b
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 25 10:59:38 2014 +0800

    Merge branch 'master' into f21

 json-c-0.11-cflags.patch |    7 -------
 json-c.spec              |   27 +++++++++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)
---