summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-03-28 21:43:03 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-03-28 21:43:03 +0200
commit2913337f8e15ec33e1637a7b7b46c9c11b80d247 (patch)
tree4f61f8bb8e24f6d56c07854685ad0b731d4f22bf /doc
parentc6c31f6206dbb8900883d2547f6ff0657113a319 (diff)
* undo some of the bzr merge damage from the last merge
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions