Merge branch 'newrules' into lenny
authorJan Dittberner <jan@dittberner.info>
Mon, 10 May 2010 18:16:02 +0000 (20:16 +0200)
committerJan Dittberner <jan@dittberner.info>
Mon, 10 May 2010 18:16:02 +0000 (20:16 +0200)
commit8e70fbdb7f9e8b6ff763f98f00332ebd1cdea7b8
treeabd4217e3149b607a653ee4211b0e243d1a45137
parentd0082377cd966934e044f03659199f0f0fce9e7e
parentf5879c5ab070e5ba1ac3ca507e242d1f9d15269a
Merge branch 'newrules' into lenny

* newrules:
  add ubuntudiff to new group Ubuntu