Zach Copley d0eb2058a5 Merge branch '0.8.x' into userdesign
Conflicts:

	actions/showfavorites.php
	lib/action.php
2009-06-14 00:23:48 +00:00
..
2009-02-06 04:03:03 -05:00
2009-05-23 23:34:05 -04:00
2009-05-22 21:11:46 -04:00
2009-03-07 12:55:09 -08:00
2009-06-08 11:55:32 -07:00
2008-12-23 14:44:28 -05:00
2008-12-23 14:33:23 -05:00
2009-06-08 11:55:32 -07:00
2009-06-09 21:51:24 -07:00