projects / debian / uanytun.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d61c93 aa74a4f)
Merge branch 'upstream'
authorMichael Prokop <mika@debian.org>
Wed, 17 Feb 2010 02:07:13 +0000 (03:07 +0100)
committerMichael Prokop <mika@debian.org>
Wed, 17 Feb 2010 02:07:13 +0000 (03:07 +0100)

Trivial merge