Merge remote branch 'origin/master'
authorFlorian Forster <octo@leeloo.octo.it>
Mon, 20 Dec 2010 08:41:04 +0000 (09:41 +0100)
committerFlorian Forster <octo@leeloo.octo.it>
Mon, 20 Dec 2010 08:41:04 +0000 (09:41 +0100)
Conflicts:
src/sn-svg.c


No differences found