Michael Vogel a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
..
2012-04-27 17:17:58 -07:00
2012-05-02 16:27:19 -07:00
2012-06-16 17:29:42 -07:00
2012-06-14 16:56:46 -07:00
2012-05-20 18:30:02 -07:00
2012-06-13 20:41:53 +02:00
2012-05-29 16:16:37 +02:00
2012-06-18 22:00:18 +01:00
2012-06-07 19:53:39 -07:00
2012-05-01 23:16:58 -07:00
2012-05-18 01:38:11 -07:00
2012-06-20 16:35:49 -07:00
2012-06-16 03:35:45 -07:00
2012-06-02 20:58:20 -07:00
2012-06-20 23:04:55 -07:00
2012-05-22 21:20:31 -07:00
2012-06-07 17:42:13 +02:00