smoother icons for eraser and shapes buttons
smoother icons for eraser and shapes buttons (by Colin Macdonald)
Merge branch 'master' of ssh://git.code.sf.net/p/xournal/code
Merge branch 'upstream' into gtk3