Merge branch 'master' into channel_list_mutex
authorDennis Schafroth <dennis@indexdata.com>
Thu, 29 Apr 2010 08:42:32 +0000 (10:42 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Thu, 29 Apr 2010 08:42:32 +0000 (10:42 +0200)
commit2ebf0b250fd141b7a3e186e7e99bfc76e29e39d7
tree04cdf7c38395e58ad60557379711f64b9f24852f
parent8534e2155f7fb19a1532510eade51736588386e3
parentce617dd90a2dc6632e7475ab73a887e0fb472c5c
Merge branch 'master' into channel_list_mutex
src/session.c