Merge branch 'unstable' into clipboard
authorMichael Jumper <zhangmaike@users.sourceforge.net>
Thu, 12 Apr 2012 08:19:56 +0000 (01:19 -0700)
committerMichael Jumper <zhangmaike@users.sourceforge.net>
Thu, 12 Apr 2012 08:19:56 +0000 (01:19 -0700)
1  2 
src/client.c

diff --cc src/client.c
Simple merge