Merge remote-tracking branch 'origin/abeck/OP_1401_qt_53_upgrade_macosx' into next
commit341de560b68a1b6931085f7bba173326c4433e39
authorFredrik Arvidsson <fredrik@arvidssons.org>
Wed, 13 Aug 2014 21:41:09 +0000 (13 23:41 +0200)
committerFredrik Arvidsson <fredrik@arvidssons.org>
Wed, 13 Aug 2014 21:41:09 +0000 (13 23:41 +0200)
tree1d5c387808dedf95d106937322d22dceac5682fb
parenteed81bd32a87e4211fc6c401453167e3ed8d44c3
parenteefe40c6a6deec64d16656e9a5ef53aedc267a28
Merge remote-tracking branch 'origin/abeck/OP_1401_qt_53_upgrade_macosx' into next