Temporary set up the svnmerge properties to merge the bieri_gui branch back into the 1.3 line.
The command used was: svnmerge.py init svn+ssh://bugman@.../svn/relax/branches/bieri_gui
This will be used solely to test if this branch can be merged.
Authored by: bugman 2010-03-16
Parent: [r11009]
Child: [r11011]
