Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:36:57 +0000 (10:36 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:37:34 +0000 (10:37 +0100)
commit4c770694381d3ba67d1932b437b163fd66347ad2
treef2272061588ee39b48120dd7b7ae88340caac0b5
parent69b7a0bb97d773d1699ce94e15fc4c86f0b10dc5
parente0cfa0fb102e73e56805d8ea7693456e46e7669e
Merge branch 'newdocs'

Change-Id: If338bfeddf4cbd1c2ea8d4335399db21f44fbf4c