[python-simplejson/f13/master] (7 commits) ...Merge branch 'master' into f13

[Toshio くらとみ]

Summary of changes:

  2e123bf... Update to 2.1.1 from upstream. (*)
  e783d30... - Filter unnecessary provides - License tag update - Minor  (*)
  c1e804c... - Rebuilt for     https://fedoraproject.org/wiki/Features/P (*)
  b893fed... dist-git conversion (*)
  3909322... - Simplify the %files section to own the tests directory -  (*)
  acd890c... - Update to upstream 2.1.2, a bugfix release with four smal (*)
  06af338... Merge branch 'master' into f13

(*) This commit already existed in another branch; no separate mail sent