Check out the latest version of Routino: svn co http://routino.org/svn/trunk routino
Merge the rest of the trunk into the 2.3.1 branch so "svn merge --reintegrate" can be used to merge the branch back into the trunk.