Merge branch 'master' of git://kenny.imendio.com/micke/giggle
commit13479828f3178d3c37e4328e3a33faff34b2f748
authorCarlos Garnacho <carlosg@gnome.org>
Sun, 21 Jan 2007 18:44:14 +0000 (21 19:44 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Sun, 21 Jan 2007 18:44:14 +0000 (21 19:44 +0100)
treee6041b34aa1bbd4b733737d06d7485640b90da22
parent3654badf72fe9956b611f13c3497a026870b5971
parent3c993ff18b74fd13e0d4a750b68614814b164dd1
Merge branch 'master' of git://kenny.imendio.com/micke/giggle