Merge commit 'HEAD'; commit '090745'
authorD Haley <mycae@yahoo.com>
Mon, 26 Jul 2010 04:33:10 +0000 (14:33 +1000)
committerD Haley <mycae@yahoo.com>
Mon, 26 Jul 2010 04:33:10 +0000 (14:33 +1000)
commit7954559c0447b83ebb295b2982cfe30ddd1091ae
tree271e343aa102b081b28ab012781db99dad7e036e
parent797a6b7b8ce228f94f5b1e15977848623f4644ec
parent0907454bb92b03cb86d4c72ab4277f77ffb227ae
Merge commit 'HEAD'; commit '090745'

Conflicts:

debian/mathgl.manpages
debian/.pc/.version
debian/mglview.1
debian/patches/parallel-build-png.patch
debian/patches/png-parallel-deps.patch
debian/patches/series
debian/rules
debian/source/format