Quantcast

Merge branch 'item_id'

Author James D. Callahan III <darkenelf@gmail.com>
Author date 2011-03-12 11:44:55
Author local date 2011-03-12 05:44:55 -0600
Committer James D. Callahan III <darkenelf@gmail.com>
Committer date 2011-03-12 11:44:55
Committer local date 2011-03-12 05:44:55 -0600
Commit cc5f7b9e1b5e95dad274f447c92979ccfa698412
Tree f62853f62518e18ced37e4c5e6dd05df5ba5410a
Parent 95d64e8467989c977e07751aa75201a40f29e5b5
Parent 81441267bf434e3b4c2d35c24783b1997e3da6b2
Merge branch 'item_id'

Conflicts:
	Database/Inscription.lua
	Database/Jewelcrafting.lua
	Database/Leatherworking.lua