[python-cjson/f20: 3/3] Merge remote-tracking branch 'origin/master' into f20

[Pavel Alexeev]

commit 84b1988fb20697d199b38bc91f5d1313bdc48533
Merge: b6d0afd 135cc08
Author: Hubbitus <pahan at hubbitus.info>
Date:   Fri Oct 24 19:22:28 2014 +0400

    Merge remote-tracking branch 'origin/master' into f20
    
    Conflicts:
    	.gitignore
    	python-cjson.spec
    	sources

 .gitignore        |    1 +
 dead.package      |    1 -
 python-cjson.spec |   65 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources           |    1 +
 4 files changed, 67 insertions(+), 1 deletions(-)
---