Merge remote-tracking branch 'IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Thu, 24 Jul 2014 08:48:08 +0000 (10:48 +0200)
committerpk910 <philipp@zoelle1.de>
Thu, 24 Jul 2014 08:48:08 +0000 (10:48 +0200)
commite17a8a5dc929df2a5ae6169f1955fcde7c70e04b
tree62fbe7f035991d19d0cd391bfc9438c803cd047f
parent285018f265af0f32438a5de357905963daaaa86f
parentacc7f60740ab12e2410fd3187fcb9a27995c0638
Merge remote-tracking branch 'IOMultiplexer/v2'

Conflicts:
src/IOHandler/IODNSLookup.c
src/IOHandler/IODNSLookup.h
configure.ac
src/crypt_base64.c
src/crypt_base64.h
src/crypt_rsa.c
src/ircd_auth.c
src/ircd_client.c
src/ircd_parse.c
src/struct_client.h
src/struct_user.h