Merge branch 'master' of git://carlos/home/carlos/work/shared/giggle
commit71992f96726b508395a389338287924ae1c29acf
authorMikael Hallendal <micke@imendio.com>
Sat, 13 Jan 2007 16:21:06 +0000 (13 17:21 +0100)
committerMikael Hallendal <micke@imendio.com>
Sat, 13 Jan 2007 16:21:06 +0000 (13 17:21 +0100)
treea58caf85132a04bb4248c4c7b7e696622053c82e
parent14ca85b0fe416ab7177ce76dbc71f6d0cbf36f00
parent51451fb10c665ad21a9c75caa7aaa11264b4805e
Merge branch 'master' of git://carlos/home/carlos/work/shared/giggle
src/Makefile.am