Merge remote-tracking branch 'gerrit/master' into newdocs
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 19 Oct 2012 07:53:42 +0000 (09:53 +0200)
committerTor Arne Vestbø <tor.arne.vestbo@digia.com>
Fri, 19 Oct 2012 07:54:12 +0000 (09:54 +0200)
commit55a36aed7935984846db2342e37160057cb3bec8
treeb84f611333fe9ec6ecda62c9ea47f954f59bc394
parenta9a87deb685600aebd9ed1cec82ad668afca88d9
parent734324c37cb9d8417aa86f76fc81dadc21be2156
Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07