Overwriting the master with 2.3-gae code, but keeping the new (2.4) project structure and build script (fixed it at various places during the process). Thus 2.3-gae has moved from sf.net SVN to GitHub, and 2.3 will soon follow. 2.4 is not canceled, but it's more efficient if I make 2.3-gae/2.3 the master, do some releases from it, then branch out 2.4, and put back those few changes that were now overwritten and were still valid. BTW, with the new build script, 2.3 is now an OSGi bundle.