Brion Vibber
9df856e667
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
..
2010-08-16 02:52:23 +00:00
2010-03-04 08:49:04 -08:00
2009-08-11 14:41:48 +12:00
2010-11-09 12:53:57 -05:00
2010-02-25 22:30:04 -05:00
2010-10-29 16:26:45 -07:00
2009-05-21 05:43:11 +00:00
2009-06-23 09:16:41 -07:00
2009-10-21 22:43:40 -04:00
2010-10-25 23:08:29 +02:00
2010-01-13 17:28:31 -08:00
2010-01-27 17:34:13 -08:00
2010-07-28 11:50:04 -04:00
2010-07-28 11:43:47 -04:00
2009-09-13 00:16:50 -04:00
2010-08-16 14:47:18 +12:00
2010-10-25 13:08:57 -07:00