]> git.tue.mpg.de Git - paraslash.git/commit
Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 09:35:41 +0000 (11:35 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 18 Jul 2009 09:35:41 +0000 (11:35 +0200)
commit35fb7de0ca7f871a6832d1041321d52af66fdf7b
tree5f0ad33b5ece6bb26af254443ddf6992e46e9a3c
parent5ae7423c1b549d762d6827f81ebe5680ca46e0db
parentaa5e4ed69209b7bed4f5c8d7596091c4b3286e51
Merge branch 'master' into next

Conflicts:
client_common.c
NEWS