Quantcast

Merge branch 'v2.3.0'

Author Alar of Daggerspine <alar@aspide.it>
Author date 2015-02-03 01:14:36
Author local date 2015-02-03 02:14:36 +0100
Committer Alar of Daggerspine <alar@aspide.it>
Committer date 2015-02-03 01:14:36
Committer local date 2015-02-03 02:14:36 +0100
Commit 53544a5ffae53524f17e25ffd3000e4c38ce684f
Tree 69a3b3bdeca7949296cd57bcb50de8a179d90e9b
Parent 284e8c080e02be5a52b5ab7d4d7415d0b1b71240
Parent e7450cea59142b611d3248109b18ee3cabcb1955
Merge branch 'v2.3.0'

Conflicts:
	GarrisonCommander.lua