Merge "Merge remote-tracking branch 'origin/dev' into stable" into refs/staging/stable
authorJ-P Nurmi <jpnurmi@digia.com>
Fri, 22 Mar 2013 15:31:39 +0000 (16:31 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 22 Mar 2013 16:07:22 +0000 (17:07 +0100)
commit4390f9322e2601b0219c984168fe7b4ec340a498
tree8b1a8e6dada17f01047cfab045e9ef8cfb7e5081
parentd2395a2237a48565b5ea50856e0fdeade703f206
parent5ac2ce5f4810092cd2135663160017e81d6c96a4
Merge "Merge remote-tracking branch 'origin/dev' into stable" into refs/staging/stable