Merge remote branch 'origin/tzork/glowplant'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:17:52 +0000 (17:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:17:52 +0000 (17:17 +0100)
commita25a5fb7b6d709c6e8ace1b4609bbba788129360
tree028e391c51ddc068df29402956e2c14b6d1e4df8
parent7d7859eb6a35b7d02486e796b900d5143362214c
parent9d6e7d2e039329c37fe84b4d727ad534b8e88d41
Merge remote branch 'origin/tzork/glowplant'