Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:26:08 +0000 (10:26 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:26:41 +0000 (10:26 +0100)
commit45a52ddaedf154c06398525567fff7972f727764
treee492a1c26f03b74604e30b0d2360727f71c55251
parentd142740257fde3c9a1e17fd352bf0d5100b547ff
parentb099bc5ef36ec6f39407e75e99de1421d80ab70b
Merge branch 'newdocs'

Change-Id: If2ee8fc472ef47e24967c29f5ba39b92e4b41098