Merge branch 'mw/config'
commit56c398c6837a43d494e03ac0ffbf2e217c1ef785
authorReinier Haasjes <reinier@haasjes.com>
Fri, 1 Jan 2010 09:51:12 +0000 (1 10:51 +0100)
committerReinier Haasjes <reinier@haasjes.com>
Fri, 1 Jan 2010 09:51:12 +0000 (1 10:51 +0100)
treece81acf80c25ab409966bb63a825658baf8a72eb
parent23b8a1a4f5df44f09cad36941127a48588e587fd
parent993116b2c0dcfe3a1f2a65780ab22b4762c07a33
Merge branch 'mw/config'