Frederik Gladhorn 190fa97c83 Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	examples/widgets/doc/src/addressbook-fr.qdoc

Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48

2013-08-27 22:51:09 +02:00

..

doc_src_qmake-manual.cpp

…

doc_src_qmake-manual.pro

…