Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:21:07 +0000 (10:21 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:21:44 +0000 (10:21 +0100)
commitbcdaf070ba43c372664ef385d4cb154d020df264
tree9ef054ed593c285e3109f56ae1f922e837f6f292
parentfcbc6043f102dce56f0c457748f489e7e2bd0c0b
parentc60ae1702e4471e9c302ced7caf8dccff0b67b8d
Merge branch 'newdocs'

Change-Id: If1ebf43ab59293eb86db2a1ffab5677c708cb93e