Merge commit 'stage/master'
commitcb3cc6dc0be2e03d00e54dd6ff3d38fd0b2186cc
authorJan Kassens <jan@kassens.net>
Sun, 30 Nov 2008 19:52:11 +0000 (30 20:52 +0100)
committerJan Kassens <jan@kassens.net>
Sun, 30 Nov 2008 19:52:11 +0000 (30 20:52 +0100)
tree825b5abb5a53f1b0f2e10a66e8f7dc0e600c2424
parent86a6e4fa69979a01858d25a63e142c534eac2fe1
parent7fe68348c463f87a7a862d23bf544a7b90e3bf31
Merge commit 'stage/master'