[python-fedora/el6] (2 commits) ...Merge branch 'master' into el6

[Toshio くらとみ]

Summary of changes:

  3bdf1ec... Bugfix release for servers using tg-1.1.x (*)
  7599b6e... Merge branch 'master' into el6

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