[python-demjson/el6/master: 3/3] Merge branch 'master' into el6

[Thomas Moschny]

commit 6e80a8c28f28d073991596d947cbfcbeff794897
Merge: a1667c9 eeb321f
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Apr 22 14:18:18 2011 +0200

    Merge branch 'master' into el6

 .gitignore          |    1 +
 python-demjson.spec |   21 ++++++++++++++-------
 sources             |    2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)
---