Merge remote branch 'upstream/master'

Conflicts: include/bb2diaspora.php
2012-07-13 23:39:51 +02:00
parent 5f400c4a97 a153621f71
commit bfca7f47ef
282 changed files with 35083 additions and 2632 deletions
--- a/include/dba.php
+++ b/include/dba.php
@@ -285,3 +285,9 @@ function dbesc_array(&$arr) {
 		array_walk($arr,'dbesc_array_cb');
 	}
 }}
+
+
+function dba_timer() {
+	return microtime(true);
+}
+