Merge branch 'master' into lore_tests
authorLorenzo Bettini <lorenzo.bettini@gmail.com>
Sat, 7 Aug 2010 11:02:00 +0000 (13:02 +0200)
committerLorenzo Bettini <lorenzo.bettini@gmail.com>
Sat, 7 Aug 2010 11:02:00 +0000 (13:02 +0200)
commit6e7cf44f510a8278ec332fce935a92c0e1fb2ef9
tree5ab10222a6dfc83ef5071ea6ff2fa03f9c5d0486
parent5511f6d4d1a8164b86349fe140b6975bda4f3e3f
parent9f86c599ec4fced94c0c6f8ec78f8b7096e79560
Merge branch 'master' into lore_tests

Conflicts:
msoma/channelsform.cpp