Craig Andrews 39392e03a7 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
2010-04-18 19:21:15 -04:00
..
2010-02-11 16:51:15 -05:00
2010-02-11 17:03:31 -05:00
2010-04-14 11:15:48 +02:00
2010-03-08 17:22:23 -05:00
2010-04-18 19:21:15 -04:00