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

[Christopher Meng]

commit faf7a7134502e4a0893ba614d516432fb442e6f5
Merge: 3dfd5b8 2f6f483
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 24 20:04:06 2014 +0800

    Merge branch 'master' into f21
    
    Conflicts:
    	json-c.spec

 .gitignore            |    1 +
 90.patch              |   28 --
 94.patch              |   88 -----
 json-c-0.11-cve.patch |  845 -------------------------------------------------
 json-c.spec           |   94 ++----
 sources               |    2 +-
 6 files changed, 30 insertions(+), 1028 deletions(-)
---