Merge commit 'origin/master' into zelgadis_master
authorKonstantin Dmitriev <ksee.zelgadis@gmail.com>
Mon, 4 Oct 2010 11:58:27 +0000 (18:58 +0700)
committerKonstantin Dmitriev <ksee.zelgadis@gmail.com>
Mon, 4 Oct 2010 11:58:27 +0000 (18:58 +0700)
commitbb8e0ba8c1f78db22f6c8b8ce4e9b4f685749092
tree67980e28bf732a138bd5ce9f6915b5dfe901f309
parent0359346f781b070b6e24d3a65c57a504e4a6ddf8
parent11420c8156f23a7341008ae3ee93f7860f0cbe25
Merge commit 'origin/master' into zelgadis_master
synfig-studio/images/Makefile.am