Merge proposals dependent on lp:~wjeremy/freenx-server/main

lp:~wjeremy/freenx-server/main has no merge proposals.