Merge remote-tracking branch 'ezust/master'
authorGunnar Sletta <gunnar.sletta@digia.com>
Sat, 3 Nov 2012 19:03:54 +0000 (20:03 +0100)
committerGunnar Sletta <gunnar.sletta@digia.com>
Sat, 3 Nov 2012 19:03:54 +0000 (20:03 +0100)
commit3d7068cbf7ace462d450cd6195fa8380b177cf48
treed33bed8d863fa13272b43791ac82c75e3c17e20a
parentd87d7f545aba8d323961fe3c8f0377aca5c7a75a
parent1504561b3fd9f032dfbd5ad2ed89a2590aca6184
Merge remote-tracking branch 'ezust/master'