lane update to mysql port
WEFC item edit #2
Shelftag #1
load products 24Mar13
custdata.LastChange
alter and triggers for custdata.LastChange
drupal/is4c membership cronjob dev1
reports 24Mar13
memlist 24Mar13
menu 24Mar13
docs 24Mar13
auth 24Mar13
cron 24Mar13
install 24Mar13
oddbits 24Mar13
BUGFIX: Bad include (only affects PHP <= 5.2.1)
Merge remote-tracking branch 'flathat/master'

Conflicts:
	.gitignore
	fannie/auth/utilities.php
	fannie/cron/nightly.dtrans.php
	fannie/item/addShelfTag.php
	fannie/item/addShelfTag1.php
	fannie/item/itemMaint.php
	fannie/item/likecodes/index.php
	fannie/item/prodFunction.php
	fannie/item/updateItems.php
	fannie/item/vendors/index.php
	fannie/logs/queries.log
	fannie/reports/RecentSales/index.php
	fannie/reports/Store-Specific/WEFC_Toronto/GeneralCosts/index.php
	fannie/sync/special/generic.mysql.php
	pos/is4c-nf/gui-modules/memlist.php