Merge branch 'fix/FreeBSD-compile-error'
authorDaniel Carl <danielcarl@gmx.de>
Mon, 28 Apr 2014 23:12:29 +0000 (01:12 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Mon, 28 Apr 2014 23:12:29 +0000 (01:12 +0200)
commit06383ae5e852e841d262fa6b42488c3b3d44e4f0
treefe39883f6327d35e13acd6cd4a09dd34c30bb6c9
parente12bba2be26ce6862072fdd6652d75702d487d4a
parent219b699acb3869ac259b2364027d3026439152f8
Merge branch 'fix/FreeBSD-compile-error'

Conflicts:
config.mk
config.mk
src/main.h
src/session.c