Merge branch 'master' into layers
authorLibrarian <Librarian>
Fri, 26 Apr 2013 12:31:21 +0000 (19:31 +0700)
committerLibrarian <Librarian>
Fri, 26 Apr 2013 12:31:21 +0000 (19:31 +0700)
commit8eed07fbc2c37eeaf2a3b394c15f800d6310be13
treed6d4f40cc6bac0ea88b0f9a742344123983d0065
parent94258e55b31eb8890cef0dce5ef3368c4f799368
parent8304b0bf8f6e6f21e1670c59babff9c2a49e7e6f
Merge branch 'master' into layers

Conflicts:
lib/document.py
gui/canvasevent.py
gui/document.py
gui/layerswindow.py
lib/document.py
lib/layer.py