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-03-02 23:25:34 -05:00
2010-04-07 10:46:23 -04:00
2010-04-02 15:56:25 -07:00