summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-08 22:47:24 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-08 22:47:24 +0100
commita74cd17ab62821d2cbaa4475dcffc3e11c08b2b7 (patch)
treea41ec0a8e19fc1da0cb8aaef5d3e419944a614c3 /doc
parent9ba25fb7d6ae555a6cdf8772ed49f00bde90af41 (diff)
fix merge error
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions