]> jfr.im git - irc/blitzed-org/charybdis.git/commit
Merge branch 'master' of git.atheme.org:/gitroot/charybdis
authorWilliam Pitcock <redacted>
Wed, 22 Feb 2012 03:09:49 +0000 (21:09 -0600)
committerWilliam Pitcock <redacted>
Wed, 22 Feb 2012 03:09:49 +0000 (21:09 -0600)
commit7c0bbdc872b7cc4ef8bc0343c0006921a3e8adcf
tree3283fd0b7f554b8903afa810290d5c26e7c01e1c
parentdc0fd46236fe65a18ce082707c3fade81a689f68
parentf8e43a0b8f58ea944830e328a31c0eecca1de38e
Merge branch 'master' of git.atheme.org:/gitroot/charybdis