Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	include/dba/dba_driver.php
	include/diaspora.php
	include/follow.php
	include/session.php
	include/zot.php
	mod/photos.php
	mod/ping.php

1 files changed, 13 insertions, 13 deletions

diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index 6e61d8759..6f46ad030 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,5 +1,17 @@
 var NAVTREEINDEX2 =
 {
+"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[5,0,7,66],
+"classApp.html#a344d2b7dc2f276648d521aee4da1731c":[5,0,7,23],
+"classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[5,0,7,55],
+"classApp.html#a3d84af5e42082098672531cd1a618853":[5,0,7,22],
+"classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[5,0,7,6],
+"classApp.html#a4776d9322edea17fae56afa5d01a323e":[5,0,7,24],
+"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[5,0,7,90],
+"classApp.html#a487332f8de40414ca1a54a4265570b70":[5,0,7,85],
+"classApp.html#a495ec082c2719314e536070ca1ce073d":[5,0,7,42],
+"classApp.html#a4b67935096f66d1f14b657399a8461ac":[5,0,7,68],
+"classApp.html#a4bdd7bfed62f50515fce652127bf481b":[5,0,7,25],
+"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[5,0,7,59],
 "classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[5,0,7,67],
 "classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[5,0,7,9],
 "classApp.html#a557d7b779d8259027f4724ebf7b248dc":[5,0,7,28],
@@ -237,17 +249,5 @@ var NAVTREEINDEX2 =
 "classRedmatrix_1_1Import_1_1Import.html#afd251e6e5a18516bac4d1a40435602f1":[5,0,4,0,0,11],
 "classTemplate.html":[5,0,25],
 "classTemplate.html#a07737733f6949bdedea1e3d301b2ab7b":[5,0,25,13],
-"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,25,12],
-"classTemplate.html#a317d535946dc065c35dd5cd38380e6c6":[5,0,25,22],
-"classTemplate.html#a35d599c9b53a02e2fe2232e5b7ed5da7":[5,0,25,2],
-"classTemplate.html#a37c15f6d1ade500943629f27a62808b7":[5,0,25,3],
-"classTemplate.html#a4b933954086d9e01a1804b0b1c6ee93e":[5,0,25,6],
-"classTemplate.html#a4e86b566c3f728e95ce5db1b33665c10":[5,0,25,21],
-"classTemplate.html#a6f0efc256688c36110180b501067ff11":[5,0,25,23],
-"classTemplate.html#a8469ab2988b6be2681516dc4b4e07d38":[5,0,25,15],
-"classTemplate.html#a86e8fd27955ef10cadfd86f3fca70677":[5,0,25,9],
-"classTemplate.html#a8f4d17e49f42b876a97364c13fb572d1":[5,0,25,19],
-"classTemplate.html#aa6a087e0b7b887dd1c98c9e0ecbd3b29":[5,0,25,4],
-"classTemplate.html#aa6f9bd7a8f7512efcf90e8d376fe05ee":[5,0,25,10],
-"classTemplate.html#aac9a4638f11271e1b1dcc9f247242718":[5,0,25,20]
+"classTemplate.html#a285b5b2007dbbf733476273df3fed4ef":[5,0,25,12]
 };