commit f7b8cf91a9afaa11d4ab870264bbd7fcd467d18a Merge: 464956c 4697784 Author: Matthias Runge <mrunge at redhat.com> Date: Wed Apr 3 09:47:55 2013 +0200 Merge branch 'f19' Conflicts: python-wsgi-jsonrpc.spec python-wsgi-jsonrpc.spec | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) ---