Merge branch 'master' of https://git.maemo.org/projects/mussorgsky
authorIvan Frade <ivan.frade@gmail.com>
Wed, 24 Jun 2009 21:13:20 +0000 (00:13 +0300)
committerIvan Frade <ivan.frade@gmail.com>
Wed, 24 Jun 2009 21:13:20 +0000 (00:13 +0300)
commitd06e9afb44dd2081621f4d1f067a0ca2cd609c89
tree2dd13770cecfc1d979de1c62a2f55945b98dcfed
parent00fa70c46eb367b60493eda27a842346b9fd9800
parentb9bc61e2ddd3ec81c244bb2a428934c4822e62c9
Merge branch 'master' of https://git.maemo.org/projects/mussorgsky

Conflicts:
src/edit_panel.py