Merge git://git.imendio.com/sven/giggle0.1
commit50df2f9a75b83dd0b7eb872662ffc1d9e2929c93
authorCarlos Garnacho <carlos@imendio.com>
Wed, 7 Mar 2007 14:53:46 +0000 (7 15:53 +0100)
committerCarlos Garnacho <carlos@imendio.com>
Wed, 7 Mar 2007 14:53:46 +0000 (7 15:53 +0100)
tree05b522e338071930de3324be747a13ecf1ed6c40
parent8c45a997f597094c92c33ec9ec265b068f7f53f5
parent4e8dcc490221b7c70052e4481572b6a4e6590488
Merge git://git.imendio.com/sven/giggle