Commit Graph

Select branches

Hide Pull Requests

1.3

1.4

1.5

1.6

1.7

11.x

12.x

13.x

14.x

15.x

16.x

2.0

2.1

2.10

2.2

2.3

2.4

2.5

2.6

2.7

2.8

2.9

detect-container

issue-1657-SVG_Support

issue-1703-historySearchMethod

issue-2164-BatchManagerUnitMode-Redesign

issue-2225-quicksearch-help

issue-2362-add-filters-options-in-admin

issue-2367-imagemagick7

issue-2386-update-filters-users-activity

issue-2391-update-menu-design

issue-2560-add-people-management

master

translation

#1015

#1020

#1025

#1026

#1027

#1027

#1030

#1037

#1045

#1050

#1050

#1062

#1065

#1071

#1076

#1082

#1083

#1083

#1093

#1093

#1103

#1103

#1104

#1104

#1117

#1131

#1132

#1135

#1139

#1146

#1146

#1147

#1151

#1156

#1161

#1161

#1164

#1164

#1169

#1169

#1173

#1177

#1178

#1184

#1184

#1191

#1196

#1202

#1220

#1220

#1268

#1268

#1269

#1274

#1278

#1282

#1286

#1306

#1321

#1327

#1327

#1329

#1330

#1330

#1332

#1332

#1376

#1376

#1384

#1384

#1385

#1385

#1418

#1420

#1421

#1427

#1431

#1435

#1436

#1437

#1541

#1543

#1548

#1556

#1556

#1575

#1578

#1578

#1579

#1579

#1580

#1585

#1597

#1597

#1608

#1615

#1620

#1623

#1623

#1630

#1633

#1637

#1638

#1648

#1648

#1663

#1681

#1682

#1685

#1687

#1688

#1702

#1706

#1708

#1716

#1748

#1749

#1754

#1762

#1763

#1763

#1776

#1785

#1791

#1791

#1797

#1805

#1817

#1817

#1822

#1822

#1828

#1828

#1846

#1848

#1850

#1850

#1853

#1853

#1857

#1864

#1864

#1865

#1865

#1870

#1885

#1885

#1896

#1906

#1922

#1927

#1943

#1943

#1944

#1952

#1952

#1961

#1961

#1980

#1980

#1981

#1981

#1985

#1988

#1988

#1989

#1989

#1990

#1990

#1991

#1992

#1992

#1993

#1993

#1994

#1995

#1996

#1996

#1997

#1997

#1998

#1999

#2002

#2002

#2006

#2006

#2010

#2012

#2014

#2023

#2023

#2056

#2056

#2068

#2075

#2085

#2107

#2107

#2111

#2111

#2115

#2116

#2116

#2121

#2125

#2126

#2171

#2179

#2183

#2183

#2184

#2190

#2214

#2215

#2216

#2216

#2219

#2219

#2222

#2236

#2236

#2240

#2242

#2266

#2266

#2273

#2273

#2282

#2293

#2298

#2301

#2302

#2302

#2305

#2305

#2307

#2307

#2320

#2320

#2332

#2344

#2344

#2346

#2349

#2349

#2352

#2359

#2363

#2382

#2385

#2395

#2399

#2400

#2403

#2416

#2422

#2432

#2435

#2446

#2463

#2463

#2471

#2471

#2482

#2487

#2497

#2497

#2501

#2506

#2506

#2511

#2511

#2524

#2524

#2526

#2526

#2527

#2535

#2542

#2543

#2543

#2547

#2547

#2549

#2549

#2556

#2558

#2559

#2559

#2561

#2561

#2562

#2562

#353

#354

#354

#365

#368

#368

#371

#374

#374

#386

#387

#387

#390

#391

#393

#395

#396

#396

#399

#399

#400

#417

#421

#421

#444

#458

#458

#468

#473

#474

#474

#477

#482

#482

#483

#489

#492

#493

#493

#494

#495

#497

#500

#501

#510

#510

#514

#518

#518

#531

#531

#538

#538

#540

#562

#562

#570

#570

#581

#581

#582

#594

#595

#597

#597

#598

#599

#614

#614

#616

#636

#636

#643

#715

#715

#722

#722

#754

#756

#757

#757

#758

#762

#762

#763

#764

#768

#769

#770

#771

#774

#776

#784

#784

#785

#786

#788

#788

#790

#790

#797

#801

#801

#803

#803

#808

#808

#810

#816

#816

#820

#834

#834

#845

#845

#846

#856

#866

#875

#884

#884

#888

#889

#894

#895

#895

#896

#901

#903

#910

#913

#913

#914

#922

#925

#925

#929

#929

#931

#931

#936

#943

#943

#944

#946

#947

#947

#952

#953

#954

#955

#956

#959

#961

#962

#967

#968

#969

#970

#970

#971

#973

#974

#975

#980

#980

#995

#997

1.3.0

1.3.0RC1

1.3.0RC2

1.3.1

1.3.2

1.3.3

1.3.4

1.4.0

1.4.0RC1

1.4.0RC2

1.4.0RC3

1.4.1

1.5.0

1.5.0RC1

1.5.0RC2

1.5.1

1.5.2

1.6.0

1.6.0RC1

1.6.0RC2

1.6.1

1.6.2

1.7.0

1.7.0RC1

1.7.0RC2

1.7.1

1.7.2

1.7.3

11.0.0

11.0.0beta5

11.1.0

11.2.0

11.3.0

11.4.0

11.5.0

12.0.0

12.0.0RC1

12.0.0RC2

12.0.0beta1

12.0.0beta2

12.1.0

12.2.0

12.3.0

13.0.0

13.0.0RC1

13.0.0RC2

13.0.0RC3

13.0.0RC4

13.0.0beta1

13.0.0beta2

13.1.0

13.2.0

13.3.0

13.4.0

13.5.0

13.6.0

13.7.0

13.8.0

14.0.0

14.0.0RC1

14.0.0RC2

14.0.0beta1

14.0.0beta2

14.0.0beta3

14.1.0

14.2.0

14.3.0

14.4.0

14.5.0

15.0.0

15.0.0beta1

15.0.0beta2

15.0.0beta3

15.1.0

15.2.0

15.3.0

15.4.0

15.5.0

15.6.0

15.7.0

16.0.0

16.0.0RC1

16.0.0RC2

16.0.0RC3

16.0.0beta1

16.0.0beta2

16.1.0

16.2.0

16.3.0

16.4.0

2.0.0

2.0.0RC1

2.0.0RC2

2.0.0RC3

2.0.0RC4

2.0.1

2.0.10

2.0.2

2.0.3

2.0.4

2.0.5

2.0.6

2.0.7

2.0.8

2.0.9

2.1.0

2.1.0RC1

2.1.0RC2

2.1.0RC3

2.1.1

2.1.2

2.1.3

2.1.4

2.1.5

2.1.6

2.10.0

2.10.0RC1

2.10.0beta1

2.10.0beta2

2.10.1

2.10.2

2.11.0beta1

2.11.0beta2

2.11.0beta3

2.11.0beta4

2.2.0

2.2.0RC1

2.2.0RC2

2.2.0RC3

2.2.0RC4

2.2.1

2.2.2

2.2.3

2.2.4

2.2.5

2.3.0

2.3.0RC1

2.3.0RC2

2.3.0beta1

2.3.0beta2

2.3.0beta3

2.3.1

2.3.2

2.3.3

2.3.4

2.3.5

2.4.0

2.4.0RC1

2.4.0RC2

2.4.0RC3

2.4.0beta1

2.4.0beta2

2.4.1

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.5.0

2.5.0RC1

2.5.0RC2

2.5.0beta1

2.5.0beta2

2.5.0beta3

2.5.1

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.6.0

2.6.0RC1

2.6.0RC2

2.6.0beta1

2.6.0beta2

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.7.0

2.7.0RC1

2.7.0RC2

2.7.0beta1

2.7.0beta2

2.7.1

2.7.2

2.7.3

2.7.4

2.8.0

2.8.0RC1

2.8.0RC2

2.8.1

2.8.2

2.8.3

2.8.4

2.8.5

2.8.6

2.9.0

2.9.0RC1

2.9.0RC2

2.9.0beta1

2.9.0beta2

2.9.1

2.9.2

2.9.3

2.9.4

2.9.5

Mono Color

• df2f3a4f4d improvement: instead of checking for #history_summary table presence, we check for #plugins table. Some web hosting provider have removed this table, causing misleading information to the upgrade script from 1.7.0. plegall 2008-11-11 13:39:56 +00:00
• 7b0669167f Add a new config value 'show_php_error' to allow debugging of RC to be easier. See topic #99192 on the forum. grum 2008-11-10 10:15:04 +00:00
• a3f21b4051 Add a new config value 'show_php_error' to allow debugging of RC to be easier. See topic #99192 on the forum. grum 2008-11-10 10:12:20 +00:00
• afe30fc962 Resolved issue 0000900: format_date function doesn't work when time is omitted with 'mysql_datetime' type rub 2008-11-09 21:49:46 +00:00
• 2a804c8b21 Resolved issue 0000900: format_date function doesn't work when time is omitted with 'mysql_datetime' type rub 2008-11-09 21:44:44 +00:00
• 14b13c4d67 merge -c2854 from trunk to branch 2.0 Correction upgrade.lang.php riopwg 2008-11-09 18:43:53 +00:00
• 1ddabfb681 Correction upgrade.lang.php riopwg 2008-11-09 18:42:13 +00:00
• 0ebfbafa91 merge -c2850 from branch 2.0 to trunk grum 2008-11-09 14:36:24 +00:00
• 4ecb7f0e25 Two fields in the database [image table] are in the 'yyyy-mm-dd' format [date_metadata_update & date_creation] and for these fields the format_date function is called with a 'mysql_datetime' format value (so, the function is waiting for 'yyyy-mm-dd hh:mm:ss' date format) Made a call with the 'us' to resolve the problem grum 2008-11-09 14:26:39 +00:00
• 30e97931af merge -c2848 from branch 2.0 to trunk plegall 2008-11-08 20:42:50 +00:00
• e88cc0f6a5 bug fixed: in r2774 a bug was introduced, piwigo.org is not available yet, and plugin manager can't connect to the extension manager. plegall 2008-11-08 20:37:31 +00:00
• dd6d5474d9 merge -c2846 from branch 2.0 to trunk ddtddt 2008-11-08 18:11:38 +00:00
• b941dcdb3a Updates c13y_upgrade/language/es_ES/plugin.lang.php ddtddt 2008-11-08 18:09:34 +00:00
• a140ac0a52 merge -c2844 from trunk to branch 2.0 ddtddt 2008-11-08 18:04:16 +00:00
• 488b9fea0a Updates upgrade.lang.php to ES ddtddt 2008-11-08 18:02:00 +00:00
• 71b9c9c8f4 merge -c2841 from trunk to branch 2.0 Updates upgrade.lang.php & c13y_upgrade/language/it_IT/plugin.lang.php riopwg 2008-11-08 13:36:22 +00:00
• 18dcf3baf7 Updates upgrade.lang.php & c13y_upgrade/language/it_IT/plugin.lang.php riopwg 2008-11-08 13:32:43 +00:00
• 187196d507 merge -c2840 from branch 2.0 to trunk New: Extend of available fields within a category page for a template-extension simple usage. Refer to topic: "Smoothgallery plugin" where no plugin is requested to do it. Minor: Some format in Sylvia theme vdigital 2008-11-07 18:51:36 +00:00
• ee8b8bb9cc New: Extend of available fields within a category page for a template-extension simple usage. Refer to topic: "Smoothgallery plugin" where no plugin is requested to do it. vdigital 2008-11-07 18:48:38 +00:00
• 2f586c6791 merge -c2838 from trunk to branch 2.0 - improve 1.3.1 upgrade (automatic write in mysql.inc.php). - translate 1.3.1 upgrade informations messages. - security fix in upgrade login. patdenice 2008-11-07 13:56:00 +00:00
• 04395a4c35 - improve 1.3.1 upgrade (automatic write in mysql.inc.php). - translate 1.3.1 upgrade informations messages. - security fix in upgrade login. patdenice 2008-11-07 13:54:35 +00:00
• 5f1fe1d4f9 merge -c2836 from trunk to branch 2.0 - Webmaster or administrator can login to run upgrade. - Inserting upgrade line in mysql.inc.php still work. - Convert espagnol upgrade file to utf8. - Minor changes in upgrade processus. - Remove all comments in pclzip.lib.php. patdenice 2008-11-06 14:46:41 +00:00
• e91161f331 - Webmaster or administrator can login to run upgrade. - Inserting upgrade line in mysql.inc.php still work. - Convert espagnol upgrade file to utf8. - Minor changes in upgrade processus. - Remove all comments in pclzip.lib.php. patdenice 2008-11-06 14:44:51 +00:00
• 894a38a9bf Issue 899 laurent.duretz 2008-11-06 07:14:12 +00:00
• 5799abb9ee Issue 899 laurent.duretz 2008-11-06 07:13:50 +00:00
• 82a2d09d76 Issue 899 laurent.duretz 2008-11-06 07:13:27 +00:00
• b352f8a4dc merge -c2831 from branch 2.0 to trunk - remove some unnecessary modifiers from template - it should be somehow faster (arguably though) rvelices 2008-11-06 01:19:55 +00:00
• 536129a4aa - remove some unnecessary modifiers from template - it should be somehow faster (arguably though) rvelices 2008-11-06 01:15:23 +00:00
• 02be99a77f merge -c2829 from trunk to branch 2.0 The exact copy of commit log in 2829. rub 2008-11-05 22:59:42 +00:00
• 4a90b52232 c13y_upgrade is deactivated by him self. de/es/it translations must be reviewed. rub 2008-11-05 22:57:32 +00:00
• 6c2d9cbf33 merge 2827 ddtddt 2008-11-05 18:16:45 +00:00
• 86f0830e1e update admin_advice to ES ddtddt 2008-11-05 18:04:53 +00:00
• f035114580 merge -c2825 from branch 2.0 to trunk vdigital 2008-11-05 13:58:02 +00:00
• 1eb4d0310e Neuronal correction... {html_head} in error related to template-extension/distributed/samples/my-thumbnails2.tpl (=> A new function to build). vdigital 2008-11-05 13:54:28 +00:00
• ad2941220f merge -c2823 from branch 2.0 to trunk - removed some unused constants from constants.php - removed some unused css rules - removed unused code rvelices 2008-11-04 01:47:48 +00:00
• 43b7a7e872 - removed some unused constants from constants.php - removed some unused css rules - removed unused code rvelices 2008-11-04 01:46:17 +00:00
• 00beb5d3ad git-svn-id: http://piwigo.org/svn/trunk@2822 68402e56-0260-453c-a942-63ccdbb3a9ee ddtddt 2008-11-03 21:04:20 +00:00
• 17334bdba3 file upgrade.lang.php in Spanish ddtddt 2008-11-03 20:18:12 +00:00
• 78af3df65b merge -c2819 from trunk to branch 2.0 - Add roma theme to upgrade page. - Upgrade translation. patdenice 2008-11-03 19:55:35 +00:00
• 214164c9a1 - Add roma theme to upgrade page. - Upgrade translation. patdenice 2008-11-03 19:52:33 +00:00
• 05ada8ba82 merge -c2817 from trunk to branch 2.0 - Neuronal correction... {html_head} in error related to template-extension/distributed/samples/my-thumbnails2.tpl vdigital 2008-11-03 19:42:52 +00:00
• 2ddd90f3c3 Neuronal correction... {html_head} in error related to template-extension/distributed/samples/my-thumbnails2.tpl vdigital 2008-11-03 19:38:09 +00:00
• 108937e81a merge -c2815 from trunk to branch 2.0 - bugs correction in upgrade_1.7.0.php. - only non-standard plugins are deactivated during upgrade. patdenice 2008-11-01 21:22:08 +00:00
• 9a7de2b6b1 - bugs correction in upgrade_1.7.0.php. - only non-standard plugins are deactivated during upgrade. patdenice 2008-11-01 21:19:20 +00:00
• 059a02f5a7 menu item "quicksearch" will be displayed only if a $block->data is set (like other menu items) use of a boolean value for the "qsearch" $block->data variable (see topic #98370) grum 2008-10-28 21:19:25 +00:00
• ae4e04da07 use of a boolean value for the "qsearch" $block->data variable (see topic #98370) grum 2008-10-27 21:45:02 +00:00
• 564d2df91d merge -c2811 from branch 2.0 to trunk plegall 2008-10-26 20:44:01 +00:00
• 027055eb9f based on forum discussion, a comment is added to explain why c13y_upgrade plugin is activated at this precise moment. plegall 2008-10-26 20:39:44 +00:00
• e9e57ab5c8 menu item "quicksearch" will be displayed only if a $block->data is set (like other menu items) grum 2008-10-26 19:10:18 +00:00
• f0b54e852a Reintroduce c13y_upgrade remove on r2754 rub 2008-10-25 21:33:11 +00:00
• abe030444b Reintroduce c13y_upgrade remove on r2754 rub 2008-10-25 21:31:30 +00:00
• c63e8f5f18 UpdatesUpdates admin_advices riopwg 2008-10-25 14:46:12 +00:00
• 31b633dd1b Updates admin_advices riopwg 2008-10-25 14:42:33 +00:00
• c2e3917fa6 Merging revision 2804 Minor: capitalization is limited to first-letter. vdigital 2008-10-25 08:24:34 +00:00
• 359bbc6775 Minor: capitalization is limited to first-letter. vdigital 2008-10-25 08:05:29 +00:00
• 632e77e27e Merging revision 2802 Advices [19] $conf['subcatify'] replaced by $conf['tags_default_display_mode'] vdigital 2008-10-24 19:00:36 +00:00
• 1523ece688 Advices [19] $conf['subcatify'] replaced by $conf['tags_default_display_mode'] vdigital 2008-10-24 18:59:02 +00:00
• b79f226548 Merging revision 2800 Refer to SVN:2789 - Advices [34]( compiled_template_cache_language ) revised vdigital 2008-10-24 17:35:34 +00:00
• 6cfa8e0194 Refer to SVN:2789 - Advices [34]( compiled_template_cache_language ) revised vdigital 2008-10-24 17:33:14 +00:00
• 82cf212731 deleting grum_plugins_classes-2 directory grum 2008-10-23 21:03:11 +00:00
• 718bfbb9a1 deleting AMenumanager directory grum 2008-10-23 21:02:25 +00:00
• 8add69c787 Merging revision 2796 Error in French advice... vdigital 2008-10-23 20:45:36 +00:00
• 96edbac452 Error in French advice... vdigital 2008-10-23 20:43:30 +00:00
• dadd219bf2 Merging revisions 2793-2794 Format Sylvia theme.css Minor: on default-layout.css category list on search page is enlarged. vdigital 2008-10-23 20:15:58 +00:00
• f16f109b6b Format Sylvia theme.css Minor: on default-layout.css category list on search page is enlarged. vdigital 2008-10-23 20:11:47 +00:00
• 5c3c778c84 Refer to SVN:2789 - include Admin Advices in [34]( compiled_template_cache_language ) and [35] ( template_compile_check ) vdigital 2008-10-23 20:10:03 +00:00
• de54bb8586 "remove AMM plugin grum 2008-10-22 21:35:23 +00:00
• fbf7b9b6ce "remove grum_plugins_classes-2 and AMM plugin grum 2008-10-22 21:08:44 +00:00
• f7aea6eb4c merge r2789 from branch 2.0: - some german language changes - added option for smarty $conf['template_compile_check'] - default true; if false smarty doesn't check if templates need recompilation resulting in less disk accesses (good when the disk is not local) - load_language doesnt check first for en_uk.utf-8 directory ... rvelices 2008-10-22 01:36:11 +00:00
• 1c1a18ccba - some german language changes - added option for smarty $conf['template_compile_check'] - default true; if false smarty doesn't check if templates need recompilation resulting in less disk accesses (good when the disk is not local) - load_language doesnt check first for en_uk.utf-8 directory ... rvelices 2008-10-22 01:34:45 +00:00
• 8d9d904c67 Merge from trunk 2787: - Move upgrade.tpl to admin template. - Deactivate all active plugins during upgrade.php. - Update Editarea for LocalFiles Editor to version 0.7.2.3 (bonEcho compatibility) patdenice 2008-10-21 23:48:48 +00:00
• 33322d4bd0 - Move upgrade.tpl to admin template. - Deactivate all active plugins during upgrade.php. - Update Editarea for LocalFiles Editor to version 0.7.2.3 (bonEcho compatibility) patdenice 2008-10-21 23:46:13 +00:00
• 463c101a28 merge -c2785 from branch 2.0 to trunk plegall 2008-10-20 21:06:21 +00:00
• 39eb742c25 bug 897 fixed: controls added in pwg.images.add to have clear error messages if permission is denied or any error occur during file write. plegall 2008-10-20 21:04:17 +00:00
• 2a162361dd Updates & Corrections riopwg 2008-10-20 10:29:43 +00:00
• d3f7c13587 Updates & Corrections riopwg 2008-10-20 10:28:37 +00:00
• 7f194e0e02 Lang file from iso8859 to utf8 riopwg 2008-10-20 00:29:16 +00:00
• c31581b442 Lang file from iso8859 to utf8 riopwg 2008-10-20 00:13:01 +00:00
• c0ba6e46a3 Merging revisions 2778-2779 0 comment is removed (Start with 1) Accurate samples/my-picture.tpl... vdigital 2008-10-19 21:02:47 +00:00
• 2f20671535 0 comment is removed (Start with 1) Accurate samples/my-picture.tpl... vdigital 2008-10-19 21:00:18 +00:00
• 4e6e78d04c CSS 2.1 cannot be reached (14 errors left). IE rule set is created (including IE hack). vdigital 2008-10-19 20:55:23 +00:00
• a6be0e500b Merging revisions 2773-2776 - Default template and Piwigo domain ... - No metadata synchronization icon on a remote picture (Synchro failure) - Jump to category icon is removed on user forbidden categories (previously check_restrictions was leading administrators to the access denied page). vdigital 2008-10-19 15:47:34 +00:00
• aa1a71488f Jump to category icon is removed on user forbidden categories (previously check_restrictions was leading administrators to the access denied page). vdigital 2008-10-19 15:37:43 +00:00
• a48c2e5281 No metadata synchronization icon on a remote picture (Synchro failure) vdigital 2008-10-19 15:31:27 +00:00
• a007e95096 Delfault template and Piwigo domain ... vdigital 2008-10-19 15:29:08 +00:00
• 3326f742fe merge rev 2771,2772 from branch 2.0 - 2771 event tracer improvement: option to show all registered event handlers for every page - 2772 php optims (small): remove/replace preg_xxx with faster simple string functions rvelices 2008-10-18 01:08:58 +00:00
• 9652b322cb - php optims (small): remove/replace preg_xxx with faster simple string functions ... rvelices 2008-10-18 01:07:13 +00:00
• 7a28366cba - event tracer improvement: option to show all registered event handlers for every page ... rvelices 2008-10-18 00:50:19 +00:00
• 90be9fbb84 - merge rev 2765,2769 from branch 2.0 * 2765 mysql potential injection paranoia + code compaction in common.inc.php * 2769 added an image sort order by privacy level (admins only) * 2769 fix an IE6 display issue with quick search on index page rvelices 2008-10-18 00:45:45 +00:00
• 79d51b19c1 - added an image sort order by privacy level (admins only) - fix an IE6 display issue with quick search on index page rvelices 2008-10-18 00:43:34 +00:00
• faa543851b merge -c2754 from branch 2.0 to trunk plegall 2008-10-17 20:39:30 +00:00
• 3c462a66a8 Last icons received from Stripy[merge] vdigital 2008-10-17 19:38:28 +00:00
• 6c962fc1bb Last icons received from Stripy vdigital 2008-10-17 19:35:48 +00:00
• 93313d760c - mysql potential injection paranoia + code compaction in common.inc.php rvelices 2008-10-17 01:06:00 +00:00
• f662cedc03 merge -c2459 from release 1.7.2 1.7.3 plegall 2008-10-16 19:53:52 +00:00
• df46024bc2 Create release 1.7.3 from branch 1.7 r2762 plegall 2008-10-16 19:39:29 +00:00
• 4411169d1a merge -c2755 from branch 2.0 to branch 1.7 plegall 2008-10-16 19:34:46 +00:00
• fb76f626ad Some Input text have been enlarged in Admin (class="large") Bullet points removed on comments in picture page. (Neuronal correction...)[merge] vdigital 2008-10-16 19:21:56 +00:00
• 376bd21335 Some Input text have been enlarged in Admin (class="large") Bullet points removed on comments in picture page. vdigital 2008-10-16 19:19:42 +00:00
• e9c0f98e14 merge r 2758 from branch 2.0 to trunk rvelices 2008-10-16 00:53:15 +00:00