Merge branch 'develop21' of https://Github.com/mangoszero/server into develop21

This commit is contained in:
Foereaper 2015-08-20 00:22:58 +02:00
commit 7dd350c2e8

View File

@ -1,6 +1,6 @@
[![](https://www.getmangos.eu/images/primus/blue/misc/logo.png)](http://www.getmangos.eu) 
[![](/icons/FORUM.gif)](https://www.getmangos.eu/forum.php)
[![](/icons/WIKI.gif)](http://github.com/mangoswiki/wiki/wiki)
[![](/icons/WIKI.gif)](https://getmangos.eu/wiki)
[![](/icons/TOOLS.gif)](http://github.com/mangostools)
[![](/icons/TRACKER.gif)](https://www.getmangos.eu/project.php)
[![Build status](https://travis-ci.org/mangoszero/server.png)][16]