Merge branch 'objects' implementing canvas objects extending ability
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 6 May 2014 10:05:47 +0000 (12:05 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 6 May 2014 10:05:47 +0000 (12:05 +0200)

Trivial merge