Andrew Chen 97bfb5e229 Merge branch 'star-confirm' of https://github.com/ashleywillis/k-9 into pull-101 ... * 'star-confirm' of https://github.com/ashleywillis/k-9: Option to have confirmation on deleting starred messages. incremented preferences/Settings.VERSION for new settings		2011-11-15 11:21:27 -08:00
..
com/fsck/k9	Merge branch 'star-confirm' of https://github.com/ashleywillis/k-9 into pull-101	2011-11-15 11:21:27 -08:00