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)
commit9f77fbe43254d5920b3b1fac1ab0c01cc3a3adcc
tree08478a84852e05c5a24edcddf2b9057b7de18f58
parent3db97a65c34df1d0e9c2abf08f7c5ae2e853004f
parentdfe6b1c24c78a546fa0d3e1432d8872c56d2df55
Merge remote branch 'origin/master'

Conflicts:
src/sn-svg.c
src/sn-svg.c