Merge branch 'master' into channel_list_mutex
authorDennis Schafroth <dennis@indexdata.com>
Thu, 29 Apr 2010 08:51:14 +0000 (10:51 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 29 Apr 2010 08:51:14 +0000 (10:51 +0200)
1  2 
src/session.c

diff --cc src/session.c
Simple merge