]> err.no Git - dak/commit
Merge commit 'mhy/master' into merge
authorJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:32:01 +0000 (14:32 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 26 Oct 2009 13:32:01 +0000 (14:32 +0100)
commit21e5bac6ffc3eca9587997822ed48f3e6093241a
tree0a08ea079db0f0547a2e6d690b8b7280fa42c05b
parentd48497f6b7b4ff0c05c5eb120daa425bdd4d6f7f
parent201f4fe6b98a5c7bae22b66110c952ea2e593ef5
Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  remove UserExtensions
  move extensions back into main code base

Signed-off-by: Joerg Jaspert <joerg@debian.org>