Graham Knop 841b1f60f7 remove merge remnants		2011-06-16 00:36:45 -05:00
..
changelog	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
credits.txt	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
gotcha.txt	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00
install.txt	README and docs/install fixes.	2011-05-20 00:37:38 -04:00
legal.txt	updating copyright year	2009-02-20 23:47:30 +00:00
license.txt
migration.txt	add migration docs for new admin on and toolbars	2011-04-19 10:44:14 -05:00
templates.txt	Merge commit 'v7.10.15' into 8	2011-05-13 18:15:11 -05:00