Merge branch 'master' of git.esoui.com:eso-GuildChat-50

Author CrazyDutchGuy <TheVeryCrazyDutchGuy@gmail.com>
Author date 2014-07-13 09:08:22
Author local date 2014-07-13 11:08:22 +0200
Committer CrazyDutchGuy <TheVeryCrazyDutchGuy@gmail.com>
Committer date 2014-07-13 09:08:22
Committer local date 2014-07-13 11:08:22 +0200
Commit 3ae44e89fcf8a7f3e938f22fb680789d4f3ad43d
Tree 09afc4146f41f6cf6c0450399cb150fd659f0c3c
Parent 7c0bd03ce42c5e96646452527e2a29d09d7e1fac
Parent 289e8fe15f42a0ea9c20f038ab91a18fe2f868c2
Merge branch 'master' of git.esoui.com:eso-GuildChat-50

Conflicts:
	GuildChat.lua
	GuildChat.txt
	Libs/libGuildInfo/LibGuildInfo.lua