Commit Graph

Select branches

Hide Pull Requests

dependabot/github_actions/actions/checkout-5

dependabot/github_actions/actions/download-artifact-5

dependabot/github_actions/actions/setup-node-5

dependabot/github_actions/softprops/turnstyle-3

dependabot/npm_and_yarn/chai-as-promised-8.0.1

dependabot/npm_and_yarn/dev-dependencies-970b190b10

dependabot/npm_and_yarn/eslint-import-resolver-typescript-4.4.4

dependabot/npm_and_yarn/main/noble/ciphers-2.0.0

dependabot/npm_and_yarn/main/noble/curves-2.0.0

dependabot/npm_and_yarn/main/noble/hashes-2.0.0

dependabot/npm_and_yarn/multi-9c823fd97f

dependabot/npm_and_yarn/sinon-21.0.0

main

pqc

v4

v5

v6.1

#100

#100

#1002

#1003

#1005

#1006

#1010

#1017

#1020

#1022

#1023

#1028

#1029

#1030

#1031

#1032

#1033

#104

#104

#1040

#1041

#1042

#1043

#1044

#1047

#105

#105

#1052

#1056

#1058

#1059

#1060

#1061

#1062

#1063

#1065

#1067

#1068

#107

#107

#1071

#1072

#1073

#1075

#1079

#1081

#1083

#1085

#1088

#1090

#1091

#1092

#1093

#1094

#1095

#1097

#110

#110

#1100

#1103

#1104

#111

#111

#1112

#1115

#1116

#1119

#112

#112

#1120

#1123

#1125

#1128

#1131

#1132

#1133

#1135

#1140

#1141

#1146

#1147

#1148

#1151

#1152

#1156

#1157

#1158

#116

#116

#1160

#1163

#1165

#1169

#117

#117

#1170

#1172

#1175

#1178

#1179

#118

#1181

#1182

#1183

#1185

#1186

#1187

#1188

#1189

#1190

#1191

#1192

#120

#1201

#1203

#1204

#1205

#121

#1228

#1233

#1234

#1235

#1236

#1238

#1241

#1244

#1246

#1249

#1250

#1251

#1252

#1259

#1260

#1261

#1262

#1264

#1265

#1267

#1268

#1269

#1275

#1276

#1278

#1279

#128

#128

#1285

#1288

#1289

#129

#129

#1291

#1294

#1297

#1298

#1299

#130

#1300

#1302

#1307

#131

#131

#1310

#1314

#1318

#1319

#132

#1323

#1324

#1326

#1327

#1328

#1329

#1331

#1333

#1334

#1336

#1337

#134

#1340

#1341

#1342

#1345

#1347

#1348

#1349

#135

#1354

#136

#136

#1362

#1369

#137

#1371

#1373

#1377

#138

#1381

#1383

#1384

#1385

#1386

#1387

#1388

#139

#1392

#1395

#140

#1401

#1402

#1404

#141

#1410

#1411

#1413

#1415

#142

#1422

#1423

#1428

#143

#1436

#1439

#144

#144

#1440

#1441

#1445

#1446

#1448

#145

#1455

#146

#146

#1462

#1463

#1474

#1475

#148

#1486

#149

#1490

#1494

#1502

#1503

#1505

#1506

#1507

#1508

#151

#1518

#1519

#1522

#1523

#1529

#153

#153

#1541

#1542

#1547

#1548

#1549

#1550

#1551

#1555

#1557

#1560

#1561

#1562

#1563

#1567

#1567

#1568

#157

#157

#1571

#1576

#1583

#1584

#1585

#1586

#1588

#1589

#1593

#1594

#1596

#1597

#1598

#1599

#160

#1600

#1602

#1603

#1606

#1612

#1618

#1620

#1623

#1625

#1627

#1628

#1629

#163

#1630

#1632

#1637

#1639

#1640

#1641

#1642

#1643

#1644

#1645

#1656

#1657

#1658

#1672

#1676

#1677

#1678

#1679

#168

#168

#1680

#1683

#1687

#169

#1691

#1692

#1694

#1696

#1699

#170

#170

#1700

#1704

#1709

#171

#171

#1711

#1711

#1712

#1713

#1715

#1715

#1716

#1717

#1719

#1721

#1722

#1723

#1724

#1726

#1728

#1734

#1736

#1737

#1739

#174

#1741

#175

#1754

#1755

#1756

#176

#1762

#1766

#1767

#1768

#1769

#1771

#1773

#1774

#1775

#1776

#1777

#1779

#1781

#1782

#1785

#1787

#1787

#1789

#179

#1794

#1798

#1799

#1801

#1802

#1804

#1805

#1807

#1811

#1812

#1820

#1821

#1822

#1823

#1824

#1825

#1826

#1828

#1829

#1831

#1832

#1834

#1842

#1843

#1844

#1845

#1850

#1851

#1853

#1854

#1855

#1856

#1857

#1861

#1862

#1866

#1869

#187

#1870

#1871

#1872

#1873

#1875

#1876

#1877

#1879

#188

#1880

#1881

#1883

#1884

#1884

#1885

#1885

#1886

#1887

#1887

#1889

#1890

#1891

#1893

#1893

#1894

#1896

#1896

#1897

#1898

#1898

#1899

#1899

#1900

#1900

#1901

#1901

#1902

#1902

#1903

#1903

#1904

#1904

#1905

#1905

#1906

#1906

#1907

#1907

#1908

#1908

#1909

#1909

#191

#191

#196

#196

#197

#197

#202

#205

#206

#206

#207

#214

#214

#217

#218

#219

#219

#222

#223

#225

#229

#232

#235

#235

#237

#238

#239

#241

#245

#248

#249

#252

#253

#256

#256

#258

#259

#260

#260

#261

#261

#265

#267

#268

#272

#273

#273

#274

#277

#281

#281

#285

#287

#287

#288

#290

#291

#292

#296

#298

#299

#300

#302

#302

#304

#304

#306

#306

#308

#308

#309

#315

#321

#321

#324

#324

#326

#327

#328

#329

#330

#330

#334

#334

#336

#337

#337

#340

#340

#344

#345

#347

#348

#352

#354

#355

#355

#357

#357

#360

#360

#364

#365

#366

#366

#368

#37

#37

#373

#374

#374

#375

#375

#376

#376

#377

#380

#388

#388

#389

#389

#39

#39

#390

#393

#394

#395

#396

#398

#400

#401

#402

#402

#404

#405

#406

#407

#409

#41

#41

#410

#410

#415

#415

#417

#43

#43

#430

#433

#434

#435

#437

#442

#446

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#462

#47

#47

#474

#476

#479

#48

#48

#483

#484

#484

#49

#49

#490

#490

#491

#493

#494

#498

#50

#50

#505

#508

#509

#510

#510

#513

#513

#514

#516

#517

#52

#52

#520

#522

#528

#529

#53

#53

#533

#534

#536

#537

#54

#54

#540

#541

#542

#543

#549

#557

#558

#558

#559

#562

#564

#565

#566

#567

#574

#576

#58

#58

#582

#586

#59

#59

#591

#593

#594

#594

#604

#605

#606

#610

#611

#612

#612

#613

#613

#618

#62

#62

#621

#626

#628

#629

#63

#63

#630

#632

#634

#635

#637

#639

#640

#642

#644

#647

#65

#65

#654

#66

#66

#660

#661

#662

#668

#672

#673

#674

#677

#679

#680

#683

#684

#685

#687

#688

#69

#69

#691

#692

#693

#694

#698

#699

#70

#70

#703

#705

#708

#709

#712

#714

#715

#72

#72

#723

#725

#728

#729

#729

#73

#73

#730

#730

#732

#733

#734

#739

#742

#746

#753

#755

#761

#763

#766

#769

#771

#772

#773

#777

#777

#778

#779

#781

#782

#787

#790

#792

#793

#794

#795

#796

#797

#798

#799

#800

#802

#805

#808

#81

#81

#810

#812

#815

#816

#817

#818

#82

#82

#820

#823

#824

#827

#828

#831

#834

#835

#837

#838

#84

#84

#840

#841

#843

#844

#846

#847

#848

#85

#85

#853

#855

#858

#864

#865

#867

#868

#869

#871

#879

#887

#888

#889

#892

#893

#894

#895

#899

#901

#909

#911

#914

#917

#919

#920

#921

#922

#928

#930

#931

#933

#935

#937

#938

#940

#941

#947

#948

#95

#95

#950

#954

#956

#96

#96

#963

#965

#967

#968

#970

#971

#972

#978

#979

#98

#98

#983

#988

#997

#998

#999

@proton/v6.1.0-patch.0

v0.1.0

v0.10.0

v0.10.1

v0.10.2

v0.10.3

v0.11.0

v0.11.1

v0.2.0

v0.2.1

v0.3.0

v0.3.1

v0.3.2

v0.4.0

v0.4.1

v0.5.0

v0.5.1

v0.6.0

v0.6.1

v0.6.2

v0.6.3

v0.6.5

v0.7.0

v0.7.1

v0.7.2

v0.8.0

v0.8.1

v0.8.2

v0.9.0

v1.0.0

v1.0.1

v1.1.0

v1.2.0

v1.3.0

v1.4.0

v1.4.1

v1.5.0

v1.5.1

v1.5.2

v1.5.3

v1.5.4

v1.5.5

v1.5.6

v1.5.7

v1.6.0

v1.6.1

v1.6.2

v2.0.0

v2.0.1

v2.1.0

v2.2.0

v2.2.1

v2.2.2

v2.3.0

v2.3.1

v2.3.2

v2.3.3

v2.3.4

v2.3.5

v2.3.6

v2.3.7

v2.3.8

v2.4.0

v2.5.0

v2.5.1

v2.5.10

v2.5.11

v2.5.12

v2.5.13

v2.5.14

v2.5.2

v2.5.3

v2.5.4

v2.5.5

v2.5.6

v2.5.7

v2.5.8

v2.5.9

v2.6.0

v2.6.1

v2.6.2

v3.0.0

v3.0.1

v3.0.10

v3.0.11

v3.0.12

v3.0.13

v3.0.2

v3.0.3

v3.0.4

v3.0.6

v3.0.7

v3.0.8

v3.0.9

v3.1.0

v3.1.1

v3.1.2

v3.1.3

v4.0.0

v4.0.1

v4.0.2

v4.1.0

v4.1.1

v4.1.2

v4.10.0

v4.10.1

v4.10.10

v4.10.11

v4.10.2

v4.10.3

v4.10.4

v4.10.5

v4.10.6

v4.10.7

v4.10.8

v4.10.9

v4.2.0

v4.2.1

v4.2.2

v4.3.0

v4.4.1

v4.4.10

v4.4.2

v4.4.3

v4.4.4

v4.4.5

v4.4.6

v4.4.7

v4.4.8

v4.4.9

v4.5.0

v4.5.1

v4.5.2

v4.5.3

v4.5.4

v4.5.5

v4.6.0

v4.6.1

v4.6.2

v4.7.0

v4.7.1

v4.7.2

v4.8.0

v4.8.1

v4.9.0

v4.9.1

v5.0.0

v5.0.0-0

v5.0.0-1

v5.0.0-2

v5.0.0-3

v5.0.0-4

v5.0.0-5

v5.0.0-6

v5.0.1

v5.1.0

v5.10.0

v5.10.1

v5.10.2

v5.11.0

v5.11.1

v5.11.2

v5.11.3

v5.2.0

v5.2.1

v5.3.0

v5.3.1

v5.4.0

v5.5.0

v5.6.0

v5.7.0

v5.8.0

v5.9.0

v6.0.0

v6.0.0-alpha.0

v6.0.0-alpha.1

v6.0.0-beta.0

v6.0.0-beta.1

v6.0.0-beta.2

v6.0.0-beta.3

v6.0.0-beta.3.patch.0

v6.0.0-beta.3.patch.1

v6.0.1

v6.1.0

v6.1.1

v6.2.0

v6.2.1

v6.2.2

Mono Color

• d28719a1d8 update readme t explain build/releases Tankred Hase 2014-01-06 15:27:52 +01:00
• 1165b52b91 do a full build including uglify in travis Tankred Hase 2014-01-06 11:21:20 +01:00
• 2985be05e4 remove Makefile since we use grunt for everything now Tankred Hase 2014-01-06 11:14:25 +01:00
• 997568ce39 removed empty git submodules file Tankred Hase 2014-01-06 11:12:53 +01:00
• 530fd9afec removed old sjcl git submodule Tankred Hase 2014-01-06 11:12:28 +01:00
• 38607d51b6 Merge pull request #143 from Robert-Nelson/chai-mocha-port Tankred Hase 2014-01-06 01:45:34 -08:00
• f436c85482 Add a bunch of links to documentation Robert Nelson 2014-01-05 23:10:19 -08:00
• 2c8a4daec5 Show full class names in nav Robert Nelson 2014-01-05 14:25:45 -08:00
• 0c6b345ba8 Refactor classes Robert Nelson 2014-01-05 10:13:25 -08:00
• 28ba64c11d Eliminate previous ci tests. Merge ci keyring tests to unittests, the other ci tests just duplicate other unit tests. Robert Nelson 2014-01-04 11:09:29 -08:00
• 598618ec8a Complete crypto/hash tests Robert Nelson 2014-01-03 23:44:04 -08:00
• 0a23d056c0 Finish crypto/cipher tests, disable subkey revocation tests Robert Nelson 2014-01-03 22:46:37 -08:00
• da5d6ff649 Fix mocha_phantomjs task to not buffer output Robert Nelson 2014-01-03 17:52:43 -08:00
• db80459cf1 Merge branch 'master' into chai-mocha-port Robert Nelson 2014-01-03 13:51:49 -08:00
• 06e4b83943 fix tests Tankred Hase 2014-01-03 21:53:41 +01:00
• 3d67721fb5 remove old files Tankred Hase 2014-01-03 20:40:05 +01:00
• 3d1575bb85 update readme Tankred Hase 2014-01-03 19:45:22 +01:00
• f56123a41f change version in package.json Tankred Hase 2014-01-03 19:41:58 +01:00
• 818ed7b9b1 readme cleanup Tankred Hase 2014-01-03 19:38:23 +01:00
• deb64215c8 Merge remote-tracking branch 'origin/devel' Tankred Hase 2014-01-03 19:26:40 +01:00
• 63571e19f0 Merge pull request #142 from Robert-Nelson/lint-fixes Tankred Hase 2014-01-03 10:25:47 -08:00
• 7d8bf90c32 remove unnecessary files and update README Tankred Hase 2014-01-03 19:12:29 +01:00
• 31b5427c87 Merge branch 'devel' into lint-fixes Robert Nelson 2014-01-03 10:11:36 -08:00
• 1cec81d576 merged devel into master Tankred Hase 2014-01-03 18:48:27 +01:00
• 51b2b6e559 add v0.1.x to travis badge v0.1.0 Tankred Hase 2014-01-03 18:35:57 +01:00
• 3ef6814421 Add new index.js files Robert Nelson 2014-01-03 08:11:55 -08:00
• 3beb4ac0ad Started porting crypto tests Robert Nelson 2014-01-03 08:10:50 -08:00
• 57cd2cd755 Merge pull request #141 from Robert-Nelson/more-doc-fixes Thomas Oberndörfer 2014-01-03 06:19:41 -08:00
• e5e1675615 Port general tests to chai/mocha Robert Nelson 2014-01-02 19:47:04 -08:00
• ef9b586214 Regen doc and resources Robert Nelson 2014-01-02 13:03:26 -08:00
• 3d4dfaea87 Add function names to constructors Robert Nelson 2014-01-02 12:50:48 -08:00
• dba6f379e8 Fix all the lint noise, mostly semicolons, duplicate var definitions and ==0 Robert Nelson 2014-01-02 12:24:10 -08:00
• 17ad1f5fed More documentation fixes Robert Nelson 2013-12-26 22:49:37 -08:00
• 8449062191 Merge pull request #140 from Robert-Nelson/doc-fixes Thomas Oberndörfer 2013-12-23 02:36:17 -08:00
• 40a5af2aae Fixup more documentation links Robert Nelson 2013-12-22 23:44:41 -08:00
• e891d81e17 Merge upstream/devel changes Robert Nelson 2013-12-22 13:01:24 -08:00
• 8923813580 Fix jsdoc generation and make keyring multiple instance. Robert Nelson 2013-12-22 12:39:11 -08:00
• b27b01905b Refactoring Key class to use structured data. Transform key from-to packetlist. Add User and SubKey class. Verification methods for key components. Thomas Oberndörfer 2013-12-20 18:19:11 +01:00
• 1ca90a980c Support multiple keys per ASCII armored block. Unify error handling: replace print_error function with exceptions. The idea is to use exceptions internally, but catch them in the high level API functions and return errors as implemented in openpgp.key.readArmored. Thomas Oberndörfer 2013-12-17 16:09:52 +01:00
• a31fe80a2c Merge readPublicKey for V3 and V4 Thomas Oberndörfer 2013-12-12 16:17:01 +01:00
• d7d74ec5e3 Verify V3 certification signatures Thomas Oberndörfer 2013-12-12 14:22:23 +01:00
• ff8d93f956 Fix key expiration time. Add key revocation unit test. Thomas Oberndörfer 2013-12-12 12:05:00 +01:00
• d22facc61c Remove CP-1252 cleartext signature unit-test Thomas Oberndörfer 2013-12-09 19:33:30 +01:00
• 5fd4bdbccb Fix make bundle-test and keyring unit-tests Thomas Oberndörfer 2013-12-09 16:57:44 +01:00
• 4979550729 Merge pull request #139 from Robert-Nelson/keyring Thomas Oberndörfer 2013-12-09 03:38:57 -08:00
• 59e942dc9e Merge pull request #138 from Robert-Nelson/integration-tests Thomas Oberndörfer 2013-12-09 03:37:04 -08:00
• 48af7ce584 Shuffle bundle names around so that openpgp.js is the debug version Robert Nelson 2013-12-09 00:30:13 -08:00
• 911e103de9 Add keyring.min.js and update openpgp bundles Robert Nelson 2013-12-08 22:50:27 -08:00
• 1d0c75a927 Add keyring bundle creation to Makefile Robert Nelson 2013-12-08 21:23:05 -08:00
• 1c07c482aa Create a bundle for keyring and split out the store code Robert Nelson 2013-12-08 20:54:25 -08:00
• f00d3210aa Convert keyring to use key interface rather than the packetlist. Robert Nelson 2013-12-08 19:35:01 -08:00
• bfba0eca0c Changed unitttests and keyring to use bundled openpgp and updated keyring to use openpgp.key instead of packetlists. Robert Nelson 2013-12-08 15:41:31 -08:00
• 30332003f8 Merge remote-tracking branch 'origin/devel' into integration-tests Robert Nelson 2013-12-08 11:02:26 -08:00
• be8cab9795 Change Makefile to build debug and non-debug versions of openpgp.js Robert Nelson 2013-12-08 10:29:50 -08:00
• 5d32718096 Normalize end of line, add getter and setter for text in literal data packet. Thomas Oberndörfer 2013-12-08 14:24:52 +01:00
• e8a2cd6621 Continuous integration testing support completed Robert Nelson 2013-12-08 04:38:44 -08:00
• 5d6e1a9506 Merge pull request #137 from Robert-Nelson/devel-signature-fixes Thomas Oberndörfer 2013-12-08 02:01:49 -08:00
• 5f30c67499 All signature unit tests passing now Robert Nelson 2013-12-06 14:26:11 -08:00
• f57de1ec40 Unit tests passing Robert Nelson 2013-12-06 09:56:05 -08:00
• 03d0d44061 Signature fixes Robert Nelson 2013-12-05 22:31:33 -08:00
• e6a116d14e Fix warnings from 'make minify' + other bugs Robert Nelson 2013-12-05 20:12:20 -08:00
• f0c2427895 Array indexing on strings is nonstandard and doesn't work on IE Robert Nelson 2013-12-05 20:03:08 -08:00
• ba565ad631 Merge d2613e27b483d577476849e1facaed7f9610f453 into 4cad3c0a44ce4e1644d2a56b475e2051d60f596d Robert Nelson 2013-12-05 16:04:06 -08:00
• d2613e27b4 missed a reference to untranslated EOL Robert Nelson 2013-12-05 15:53:02 -08:00
• c555dbfba9 Eliminate bogus EOL translations Robert Nelson 2013-12-05 14:27:15 -08:00
• 56b4a4c0b4 Merge adef8f8e4e767f41e2ed6885c3c3531b3ae12641 into 4cad3c0a44ce4e1644d2a56b475e2051d60f596d Slavik Markovich 2013-12-05 13:23:56 -08:00
• 4cad3c0a44 Merge pull request #135 from openpgpjs/new_line Tankred Hase 2013-12-05 13:15:42 -08:00
• fb44405de5 Merge pull request #134 from Robert-Nelson/another-signature-fix Tankred Hase 2013-12-05 13:14:11 -08:00
• db2f20448c fix signature test Tankred Hase 2013-12-05 22:12:32 +01:00
• 8860161c67 Merge branch 'another-signature-fix' of github.com:Robert-Nelson/openpgpjs into new_line Tankred Hase 2013-12-05 22:08:48 +01:00
• f07702e867 More consistency changes Robert Nelson 2013-12-05 12:29:52 -08:00
• e965b6771b Cleanup canonical message handling for signatures Robert Nelson 2013-12-05 12:21:23 -08:00
• caaedc16bf reconstruct bug in signature verification Tankred Hase 2013-12-05 17:27:56 +01:00
• 8c16abbfee bugfix for only call showMessage if it was defined Tankred Hase 2013-12-05 12:37:55 +01:00
• fecad8b8c0 only call showMessage if it was defined Tankred Hase 2013-12-05 12:33:03 +01:00
• af29686442 Merge pull request #130 from Robert-Nelson/signature-fix Tankred Hase 2013-12-05 02:53:43 -08:00
• d43b6df378 Merge pull request #132 from Robert-Nelson/build-status-fix Tankred Hase 2013-12-05 01:48:42 -08:00
• 2e100068f1 Put the query string on the right url Robert Nelson 2013-12-04 21:07:44 -08:00
• 0ebe4fd516 Only report build status for master and devel Robert Nelson 2013-12-04 21:05:07 -08:00
• aa377b7cc9 Add verification of V3 signatures Robert Nelson 2013-12-04 20:38:52 -08:00
• 835a05853e Change message to match others Robert Nelson 2013-12-04 19:39:15 -08:00
• f8d8d471a9 Add test of verification of a clearsign message generated by gpg Robert Nelson 2013-12-04 19:33:44 -08:00
• e9b8b0efb9 Incorporate integration test changes from signature branch Robert Nelson 2013-12-04 18:11:14 -08:00
• 8110782633 Fix checksum failure debug message Robert Nelson 2013-12-04 15:42:56 -08:00
• d618462a08 Merge 36ac801111a77a2fab364de635ca41ba119d2d66 into 9ee587ad4f39b1ace166ca3f9ddc5510ce0b8431 Robert Nelson 2013-12-04 15:30:51 -08:00
• 36ac801111 Add jquery Robert Nelson 2013-12-04 15:30:36 -08:00
• f7baeb36a3 Fix signature verification Robert Nelson 2013-12-04 10:45:03 -08:00
• f6176ed484 Move key generation to Key class Thomas Oberndörfer 2013-12-04 16:45:14 +01:00
• 9ee587ad4f add signature check to integration test Tankred Hase 2013-12-04 12:26:03 +01:00
• 7e711510cc Implement cleartext signed messages Thomas Oberndörfer 2013-12-02 20:11:21 +01:00
• be96de5188 Move methods of Key and Message class to prototype. Clean up openpgp.js file. Thomas Oberndörfer 2013-12-02 14:54:05 +01:00
• 89eb5dff2a Rename attribute for data of armored message from .openpgp to .data Thomas Oberndörfer 2013-12-02 11:27:14 +01:00
• 63db9246c6 Enhance debugging output and fix escaped dashes. Robert Nelson 2013-12-01 17:46:56 -08:00
• e1908496c7 Add verification for version 3 signatures Robert Nelson 2013-11-30 22:29:28 -08:00
• 84f6483cba Fix signing with version 3 keys Robert Nelson 2013-11-30 21:17:04 -08:00
• 1f4911450b Resolve two more situations Robert Nelson 2013-11-30 12:29:47 -08:00
• c2a79368dc Add verify method to message class and other improvements. Implement openpgp.decryptAndVerifyMessage. Allow parsing of unhashed signature subpackets. Thomas Oberndörfer 2013-11-30 17:29:20 +01:00
• f59fa54ecf Fix ascii dearmor and signature verification bugs Robert Nelson 2013-11-29 19:29:57 -08:00
• b4676d2ad8 Merge branch 'misc-fixes' into signature-fix Robert Nelson 2013-11-29 18:34:36 -08:00
• bc27f7289c Merge 8b854a2ad155be525ddc944346568bfd9b0424d0 into 1cd7b542a0c3478f71e0a95343e60fad9889ead2 Robert Nelson 2013-11-29 17:09:14 -08:00