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)
commit649a9d45b919c376ddcbb89e0d34c4efeeb29fb9
tree558cea55ed42e2ca36c3b9e56e8ae853c3abd8a7
parent2ebf0b250fd141b7a3e186e7e99bfc76e29e39d7
parent9b618cd2fb7169e783f1dcc0902074c954c1df76
Merge branch 'master' into channel_list_mutex
src/session.c