Merge branch '1.8' of ssh://git.sigterm.info/gitroot/anope/anope into 1.8

Browse Source

Conflicts:
	version.log

...

This commit is contained in:

Adam

2010-08-14 12:22:29 -04:00

parent d1b5797f5d f1fa7e1a5f

commit fac3b85903

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available