# # ChangeLog for trunk # # Generated by Trac 1.6 # 05/16/24 22:45:14 Thu, 13 May 2010 19:29:46 GMT Kris Deugau [412] * trunk/cgi-bin/admin.cgi (modified) * trunk/header.inc (modified) /trunk Remove blatant "this is a development environment" warnings ... Thu, 13 May 2010 17:12:09 GMT Kris Deugau [409] * trunk/cgi-bin/ipdb.psql (modified) /trunk Minor typofix on preseeded alloctypes. See #13. Wed, 12 May 2010 20:10:04 GMT Kris Deugau [406] * trunk/cgi-bin/main.cgi (modified) /trunk Fix some trivial typos introduced with r405. See #13. Wed, 12 May 2010 20:07:37 GMT Kris Deugau [405] * trunk/cgi-bin/main.cgi (modified) /trunk Add, in comments, mail notifications present in ... Tue, 11 May 2010 22:05:54 GMT Kris Deugau [404] * trunk/cgi-bin/IPDB.pm (modified) /trunk Merge "temporary" fix-up-the-IP-pool deallocation hack. See ... Tue, 11 May 2010 21:52:57 GMT Kris Deugau [403] * trunk/cgi-bin/ipdb.psql (modified) /trunk Update SQL tabledef and alloctype preseeding with latest ... Tue, 11 May 2010 21:33:34 GMT Kris Deugau [402] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/consistency-check.pl (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/search.cgi (modified) /trunk Merge miscellaneous microdifferences that have crept in. ... Tue, 11 May 2010 21:10:00 GMT Kris Deugau [401] * trunk/cgi-bin/combineblocks.pl (copied) /trunk Merge add of combineblocks.pl from r306. See #13. Tue, 11 May 2010 21:06:26 GMT Kris Deugau [400] * trunk/cgi-bin/CustIDCK.pm (copied) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/checkcusts.pl (copied) * trunk/cgi-bin/main.cgi (modified) /trunk Merge addition of CustIDCK.pm from r56 - proprietary info ... Tue, 11 May 2010 18:59:27 GMT Kris Deugau [399] * trunk/cgi-bin/access-pwd-update.pl (modified) /trunk Merge updates/bugfixes to access-pwd-update.pl from r386. ... Tue, 11 May 2010 18:56:06 GMT Kris Deugau [398] * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/editcust.php (copied) * trunk/cgi-bin/list-cust.php (copied) * trunk/cgi-bin/updatecust.php (copied) /trunk Merge add (r343) and updates (r392 and r393) to quick-hack ... Mon, 10 May 2010 21:33:13 GMT Kris Deugau [397] * trunk/assign.html (modified) * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/newnode.cgi (copied) * trunk/cgi-bin/search.cgi (modified) * trunk/confirm.html (modified) * trunk/editDisplay.html (modified) * trunk/fb-assign.html (modified) * trunk/header.inc (modified) * trunk/ipdb.css (modified) * trunk/newnode.html (copied) * trunk/nodesearch.html (copied) /trunk Merge basic node-tracking from r393:396 into trunk. See #13. Thu, 22 Jan 2009 21:30:04 GMT Kris Deugau [388] * trunk/cgi-bin/ipdb.psql (modified) /trunk Update alloctypes preseeding Tue, 01 Apr 2008 18:49:40 GMT Kris Deugau [382] * trunk/cgi-bin/search.cgi (modified) [ History-conversion filler commit. Original log message: ] /trunk ... Tue, 22 Jan 2008 21:11:01 GMT Kris Deugau [380] * trunk/cgi-bin/access-pwd-update.pl (copied) * trunk/cgi-bin/extras/db2rwhois.pl (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/header.inc (modified) * trunk/updated.html (modified) /trunk Merge bugfixes/updates from /branches/stable r317 through r379 Tue, 27 Nov 2007 17:27:45 GMT Kris Deugau [371] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/extras/db2rwhois.pl (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/search.cgi (modified) * trunk/cgi-bin/snCalc.cgi (modified) * trunk/help.html (modified) * trunk/ipdb.css (modified) /trunk Merge bugfixes and enhancements from /branches/stable r360 ... Tue, 27 Nov 2007 17:18:27 GMT Kris Deugau [370] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/newcity.cgi (modified) * trunk/cgi-bin/search.cgi (modified) * trunk/compsearch.html (modified) * trunk/header.inc (modified) * trunk/help.html (modified) /trunk Merge bugfixes and enhancements from /branches/stable r351 ... Fri, 06 Oct 2006 16:24:32 GMT Kris Deugau [352] * trunk/cgi-bin/consistency-check.pl (modified) /trunk Backport semicosmetic bugfixery to consistency-check.pl ... Fri, 06 Oct 2006 16:23:39 GMT Kris Deugau [351] * trunk/cgi-bin/search.cgi (modified) /trunk Backport bugfixes from r303, r307, r309, r318, r319, and ... Fri, 06 Oct 2006 16:21:59 GMT Kris Deugau [350] * trunk/cgi-bin/IPDB.pm (modified) /trunk Backport bugfixery from /branches/stable r304 Fri, 06 Oct 2006 16:20:42 GMT Kris Deugau [349] * trunk/cgi-bin/IPDB.pm (modified) /trunk Backport bugfixery from /branches/stable r336 Fri, 06 Oct 2006 16:19:14 GMT Kris Deugau [348] * trunk/cgi-bin/admin.cgi (modified) /trunk Backport fix from /branches/stable r269 to pull admin.cgi ... Fri, 06 Oct 2006 16:18:44 GMT Kris Deugau [347] * trunk/cgi-bin/ipdb.psql (modified) /trunk Replace ipdb.psql SQL tabledef/database prep with latest ... Fri, 06 Oct 2006 16:16:10 GMT Kris Deugau [345] * trunk/assign.html (modified) * trunk/confirm.html (modified) * trunk/fb-assign.html (modified) /trunk Backport HTML cleanup from /branches/stable r271 Fri, 06 Oct 2006 16:15:33 GMT Kris Deugau [344] * trunk/alloctypes.html (modified) /trunk Backport changes to alloctypes.html from /branches/stable ... Thu, 06 Jul 2006 22:03:10 GMT Kris Deugau [341] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk revert commit of unknown unremembered changes to db2rwhois.pl Thu, 06 Jul 2006 22:00:55 GMT Kris Deugau [340] * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Make it clear where I'm working for admin tools Fri, 07 Apr 2006 22:01:00 GMT Kris Deugau [331] * trunk/cgi-bin/admin.cgi (modified) /trunk Basic editing capability for rWHOIS customer contact data. ... Fri, 07 Apr 2006 17:40:42 GMT Kris Deugau [330] * trunk/cgi-bin/admin.cgi (modified) /trunk Added supporting code to update masterblock modified ... Fri, 07 Apr 2006 17:36:54 GMT Kris Deugau [329] * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/ipdb.psql (modified) /trunk Update SQL tabledefs with defaults on the customers table ... Fri, 07 Apr 2006 17:34:55 GMT Kris Deugau [328] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Tighten 'rules' for exporting customer data. Only types ... Fri, 07 Apr 2006 17:16:31 GMT Kris Deugau [327] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Merge alloctype reference tweak/fix from /branches/stable r326 Thu, 06 Apr 2006 19:47:21 GMT Kris Deugau [324] * trunk/cgi-bin/extras/db2rwhois.pl (modified) * trunk/cgi-bin/extras/network.tmpl (added) * trunk/cgi-bin/extras/rwhois-config (added) * trunk/cgi-bin/extras/rwhois-net-skel.tar.gz (added) * trunk/cgi-bin/ipdb.psql (modified) /trunk Refactor rWHOIS export for easier rWHOIS data access. ... Wed, 05 Apr 2006 16:20:09 GMT Kris Deugau [321] * trunk/cgi-bin/ipdb.psql (modified) /trunk Update SQL tabledefs and "default" alloctypes with current ... Tue, 04 Apr 2006 22:25:28 GMT Kris Deugau [320] * trunk/assign.html (modified) * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/MyIPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/freespace.pl (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/search.cgi (modified) * trunk/editDisplay.html (modified) * trunk/updated.html (modified) /trunk Merge all bugfixes, hacks, tweaks, and miscellaneous updates ... Fri, 31 Mar 2006 20:42:00 GMT Kris Deugau [316] * trunk/cgi-bin/ipdb.psql (modified) /trunk Update SQL tabledef source file Fri, 31 Mar 2006 18:43:07 GMT Kris Deugau [314] * trunk/cgi-bin/main.cgi (modified) /trunk Fix billing backlinks with custid=... instead of oldcustid=... Fri, 31 Mar 2006 18:41:09 GMT Kris Deugau [313] * trunk/cgi-bin/main.cgi (modified) /trunk Missing $ on $webvar. Oops. Fri, 31 Mar 2006 16:52:25 GMT Kris Deugau [312] * trunk/cgi-bin/main.cgi (modified) /trunk Remove billing backlink for "regular" IPDB allocation of DSL ... Tue, 28 Mar 2006 20:27:06 GMT Kris Deugau [311] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Copy db2rwhois.pl from /branches/stable. Thu, 17 Nov 2005 17:21:22 GMT Kris Deugau [302] * trunk/cgi-bin/main.cgi (modified) /trunk Tweak billing return links with extra data Thu, 17 Nov 2005 16:25:31 GMT Kris Deugau [301] * trunk/cgi-bin/main.cgi (modified) /trunk Make billing backlink for static DSL IPs more readable in ... Wed, 16 Nov 2005 23:01:10 GMT Kris Deugau [300] * trunk/cgi-bin/main.cgi (modified) /trunk Tweaked code to make it more friendly to outside calls to ... Tue, 15 Nov 2005 23:00:37 GMT Kris Deugau [299] * trunk/cgi-bin/main.cgi (modified) /trunk Tweak billing crosslink to carry billing userid through DSL ... Tue, 15 Nov 2005 18:17:00 GMT Kris Deugau [297] * trunk/cgi-bin/main.cgi (modified) /trunk Add backlink to billing system on successful static DSL IP ... Fri, 14 Oct 2005 15:20:02 GMT Kris Deugau [295] * trunk/cgi-bin/admin.cgi (modified) /trunk Bugfix for the bugfix in r292. (merge) Fri, 14 Oct 2005 15:16:45 GMT Kris Deugau [293] * trunk/cgi-bin/admin.cgi (modified) /trunk Merge bugfix from /branches/stable r292 Fri, 07 Oct 2005 15:12:16 GMT Kris Deugau [289] * trunk/cgi-bin/search.cgi (modified) /trunk Merge bugfix from /branches/stable r288 Wed, 21 Sep 2005 21:58:37 GMT Kris Deugau [285] * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/search.cgi (modified) * trunk/help.html (modified) /trunk help.html Tweak up new search system to work properly - ... Wed, 21 Sep 2005 20:30:31 GMT Kris Deugau [284] * trunk/assign.html (modified) * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/confirm.html (modified) * trunk/confirmRemove.html (modified) * trunk/editDisplay.html (modified) * trunk/fb-assign.html (modified) * trunk/updated.html (modified) /trunk Merge /branches/privdata r278:283 (with notable exception of ... Fri, 16 Sep 2005 21:19:24 GMT Kris Deugau [279] * trunk/ipdb.css (modified) /trunk Add "color0" definition for table rows. This is necessary ... Fri, 17 Jun 2005 20:08:35 GMT Kris Deugau [261] * trunk/cgi-bin/main.cgi (modified) /trunk Cleanup - remove unused function countRows() and unused ... Mon, 13 Jun 2005 20:33:16 GMT Kris Deugau [259] * trunk/cgi-bin/admin.cgi (modified) /trunk Modify add user capability in admin.cgi to allow a ... Mon, 13 Jun 2005 20:26:30 GMT Kris Deugau [258] * trunk/cgi-bin/admin.cgi (modified) /trunk Add (very) limited user management to admin.cgi - add and ... Tue, 31 May 2005 21:04:07 GMT Kris Deugau [257] * trunk/cgi-bin/ipdb.psql (modified) /trunk Update ipdb.psql tabledefs and default alloctypes Tue, 31 May 2005 18:24:33 GMT Kris Deugau [256] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/main.cgi (modified) /trunk Merge bugfixes from /branches/stable r248:252. Tue, 31 May 2005 18:18:35 GMT Kris Deugau [255] * trunk/cgi-bin/main.cgi (modified) * trunk/editDisplay.html (modified) /trunk Merge "Last Modified" display from /branches/stable r245 ... Tue, 31 May 2005 18:09:48 GMT Kris Deugau [254] * trunk/editDisplay.html (modified) * trunk/ipdb.css (modified) /trunk Revert CSS change that snuck in at r197 in /branches/new- ... Wed, 18 May 2005 19:51:11 GMT Kris Deugau [247] * trunk/cgi-bin/main.cgi (modified) /trunk Turn off notifications for devel changes. Don't need to ... Wed, 18 May 2005 19:36:14 GMT Kris Deugau [246] * trunk/cgi-bin/IPDB.pm (modified) /trunk Fix bug where assigning a static DSL block (or equivalent) ... Tue, 19 Apr 2005 17:52:12 GMT Kris Deugau [240] * trunk/cgi-bin/main.cgi (modified) * trunk/editDisplay.html (modified) /trunk *Weird* display bugfix that doesn't show up in the branch ... Tue, 19 Apr 2005 16:25:47 GMT Kris Deugau [237] * trunk/cgi-bin/ipdb.psql (modified) /trunk Bugfix in tabledef for users table (required for ACLs) - ... Mon, 18 Apr 2005 20:27:21 GMT Kris Deugau [234] * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/search.cgi (copied) * trunk/compsearch.html (copied) * trunk/header.inc (modified) * trunk/help.html (modified) * trunk/ipdb.css (modified) /trunk Merge new search capability from ... Fri, 15 Apr 2005 22:11:39 GMT Kris Deugau [233] * trunk/addmaster.html (copied) * trunk/addmaster.shtml (deleted) * trunk/cgi-bin/CommonWeb.pm (modified) * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/editDisplay.html (modified) * trunk/header.inc (modified) * trunk/index.shtml (modified) /trunk Merge /branches/acl r221, 222, 223, 225, 226 back to trunk Fri, 15 Apr 2005 21:16:16 GMT Kris Deugau [232] * trunk/changes.html (modified) /trunk Missing backport: update changes.html from /branches/stable r193 Fri, 15 Apr 2005 21:10:52 GMT Kris Deugau [231] * trunk/cgi-bin/main.cgi (modified) /trunk Missing backport: update to fix display issue relating to ... Fri, 15 Apr 2005 20:49:07 GMT Kris Deugau [229] * trunk/alloctypes.html (modified) /trunk Missing backport: pull update to alloctypes.html from ... Fri, 15 Apr 2005 20:31:44 GMT Kris Deugau [228] * trunk/cgi-bin/main.cgi (modified) /trunk Port forward bugfixes from /branches/stable r215, r220, and r224. Fri, 15 Apr 2005 20:29:34 GMT Kris Deugau [227] * trunk/cgi-bin/main.cgi (modified) /trunk Revert change from r73 (!!) that "allocates" a static IP ... Wed, 06 Apr 2005 21:08:15 GMT Kris Deugau [219] * trunk/cgi-bin/ipdb.psql (modified) /trunk Missed some tabledef changes in r218 Wed, 06 Apr 2005 21:06:28 GMT Kris Deugau [218] * trunk/cgi-bin/extras/db2rwhois.pl (modified) * trunk/cgi-bin/ipdb.psql (modified) /trunk Updated SQL tabledefs with timestamps for master block, ... Tue, 05 Apr 2005 18:24:52 GMT Kris Deugau [214] * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/consistency-check.pl (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/newcity.cgi (modified) /trunk Port bugfixes from /branches/stable r203-206 and r209-213 ... Thu, 17 Mar 2005 17:30:51 GMT Kris Deugau [199] * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/ipdb.css (modified) /trunk Update admin.cgi (such as it was) to newer IPDB backend ... Wed, 16 Mar 2005 20:58:48 GMT Kris Deugau [198] * trunk/cgi-bin/allocate.pl (copied) /trunk Port allocate.pl forward to trunk from /branches/stable r188 Thu, 10 Mar 2005 18:46:49 GMT Kris Deugau [191] * trunk/cgi-bin/main.cgi (modified) /trunk Fixed buglet that would have incorrectly allowed allocation ... Tue, 08 Mar 2005 22:40:12 GMT Kris Deugau [190] * trunk/cgi-bin/consistency-check.pl (modified) /trunk consistency-check.pl: Updated to be consistent with the ... Tue, 08 Mar 2005 22:37:46 GMT Kris Deugau [189] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) /trunk Caught some buglets in the HairyPerl(TM) ('$1' vs "$1") ... Fri, 04 Mar 2005 23:12:54 GMT Kris Deugau [187] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/ipdb.psql (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/fb-assign.html (modified) /trunk Another herd of changes to alloctypes. This cleaned up the ... Thu, 03 Mar 2005 22:14:54 GMT Kris Deugau [186] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/main.cgi (modified) /trunk First round of changes for "clean" handling of subblock ... Tue, 01 Mar 2005 21:22:39 GMT Kris Deugau [184] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/main.cgi (modified) /trunk Tweaked another few fixes into place to make a "fresh" ... Tue, 01 Mar 2005 21:05:45 GMT Kris Deugau [183] * trunk/cgi-bin/IPDB.pm (modified) /trunk Change database connection check slightly to select from the ... Tue, 01 Mar 2005 20:57:53 GMT Kris Deugau [182] * trunk/cgi-bin/ipdb.psql (modified) /trunk Preseed alloctypes table with current types ("common" ones ... Tue, 01 Mar 2005 20:56:35 GMT Kris Deugau [181] * trunk/cgi-bin/ipdb.psql (modified) /trunk Change SQL definitions to create the database before ... Tue, 01 Mar 2005 19:44:40 GMT Kris Deugau [180] * trunk/cgi-bin/ipdb.psql (modified) /trunk Fix another buglet with the SQL definitions. Picky, picky... Tue, 01 Mar 2005 19:08:15 GMT Kris Deugau [179] * trunk/cgi-bin/ipdb.psql (modified) /trunk Fix buglet in SQL definitions (ported forward from ... Tue, 01 Mar 2005 18:31:45 GMT Kris Deugau [176] * trunk/cgi-bin/ipdb.psql (modified) /trunk Full update of ipdb.psql without extraneous pg_dump bits, ... Tue, 01 Mar 2005 16:49:46 GMT Kris Deugau [175] * trunk/cgi-bin/ipdb.psql (modified) /trunk Updated SQL table definitions - pg_dump format Thu, 24 Feb 2005 22:12:09 GMT Kris Deugau [173] * trunk/cgi-bin/main.cgi (modified) /trunk Merged additional SQL cleanup changes from ... Tue, 22 Feb 2005 19:25:58 GMT Kris Deugau [167] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/consistency-check.pl (modified) * trunk/cgi-bin/main.cgi (modified) /trunk New feature: Different "default" CustIDs depending on the ... Tue, 22 Feb 2005 17:23:36 GMT Kris Deugau [166] * trunk/cgi-bin/main.cgi (modified) /trunk Merged bugfixes from /branches/stable r162-165. ** NB: ... Wed, 09 Feb 2005 22:56:08 GMT Kris Deugau [161] * trunk/cgi-bin/main.cgi (modified) /trunk Backport bugfix from /branches/stable r160 Tue, 08 Feb 2005 20:56:33 GMT Kris Deugau [157] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/main.cgi (modified) /trunk Merge changes from /branches/sql-cleanup into mainline - ... Tue, 01 Feb 2005 22:02:39 GMT Kris Deugau [146] * trunk/cgi-bin/IPDB.pm (modified) * trunk/cgi-bin/admin.cgi (modified) * trunk/cgi-bin/extras/db2rwhois.pl (modified) * trunk/cgi-bin/freespace.pl (modified) /trunk Update copyright statements Mon, 31 Jan 2005 23:12:32 GMT Kris Deugau [144] * trunk/assign.html (modified) /trunk Speeling fix in assign.html Fri, 28 Jan 2005 23:01:20 GMT Kris Deugau [143] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Tweak/update db2rwhois with latest (My)IPDB interface Fri, 28 Jan 2005 19:04:55 GMT Kris Deugau [142] * trunk/cgi-bin/MyIPDB.pm (added) * trunk/cgi-bin/consistency-check.pl (modified) * trunk/cgi-bin/freespace.pl (modified) * trunk/cgi-bin/main.cgi (modified) * trunk/cgi-bin/newcity.cgi (modified) /trunk Wrap connectDB() function in a "module" so we don't get ... Fri, 28 Jan 2005 18:41:07 GMT Kris Deugau [141] * trunk/cgi-bin/extras/db2rwhois.pl (modified) /trunk Fix svn: properties on db2rwhois.pl. Really. Thu, 27 Jan 2005 22:31:57 GMT Kris Deugau [139] * trunk/assign.html (modified) * trunk/cgi-bin/newcity.cgi (added) * trunk/changes.html (modified) * trunk/newcity.html (added) /trunk Added ability to add cities/locations to database. Not yet ... Wed, 26 Jan 2005 22:31:33 GMT Kris Deugau [138] * trunk/cgi-bin/main.cgi (modified) /trunk Redesign alloctype check so that it checks alloctypes that ... Wed, 26 Jan 2005 22:07:26 GMT Kris Deugau [137] * trunk/cgi-bin/main.cgi (modified) /trunk Merge bugfix in /branches/stable r136