Michael Vogel d653e27e2d Merge commit 'upstream/master'
Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
2012-03-11 20:22:28 +01:00
..
2012-02-15 23:58:28 -08:00
2012-02-25 14:22:51 -08:00
2012-03-10 18:52:50 -08:00
2012-02-26 14:29:17 +00:00
2012-02-25 14:22:51 -08:00
2012-02-29 19:23:01 -08:00
2012-02-26 20:43:51 +00:00
2012-02-02 18:02:08 -08:00
2012-03-09 11:41:23 +01:00
2012-02-26 14:34:01 -08:00
2012-03-11 19:45:28 +01:00