dap commit: merge heads, back to one head

changeset:   204:58fadbd65d13
tag:         tip
parent:      203:1c5a2f31a18d
parent:      198:9b0f272960e2
user:        Anssi Kostiainen <anssi.kostiainen@nokia.com>
date:        Mon Aug 27 10:18:35 2012 +0300
files:       discovery-api/Overview.html discovery-api/Overview.src.html
description:
merge heads, back to one head

Received on Monday, 27 August 2012 07:20:07 UTC