]> git.netwichtig.de Git - user/henk/code/inspircd.git/commit
Merge branch 'testbranch'
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Sun, 7 Sep 2008 16:24:57 +0000 (16:24 +0000)
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Sun, 7 Sep 2008 16:24:57 +0000 (16:24 +0000)
commitfc86c60df8ae818513c5ebaf3ea8a7ce41df1e16
tree4f8842a8dd247edb167759722c24c59c22c73894
parent8134bbd2866112cbca53279ab37255959e0f9d2a
Merge branch 'testbranch'

Conflicts:

sources.list

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10442 e03df62e-2008-0410-955e-edbf42e46eb7
sources.list