[mingw-qt/f18: 2/2] Merge branch 'master' into f18

[Erik van Pienbroek]

commit 6bbd575c4d3e8c0b2c910bc28764d8024dfcfbc3
Merge: 1233471 2f59571
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed May 22 23:06:08 2013 +0200

    Merge branch 'master' into f18

 ...-set-shared-config-flag-for-lib-templates.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---