Merge remote branch 'origin/lado' into modular
commitfb3ad8cfb0afe93385e0063036d5bafb20615218
authorFelix Bechstein <f@ub0r.de>
Mon, 18 Jan 2010 08:43:03 +0000 (18 09:43 +0100)
committerFelix Bechstein <f@ub0r.de>
Mon, 18 Jan 2010 08:43:03 +0000 (18 09:43 +0100)
treeddf50465b0e459b48d88358a846c3850dbb1e7d5
parent7c3912c4a7317fbf6ef4fcf181f0f37f90e68b27
parent3277022abae001b778c1845c26629ead456ffc3d
Merge remote branch 'origin/lado' into modular