> Hercules merges:

* e15fe61:
Brandish spear can now be used by rune knights riding dragons. Made riding state check for both peco and dragon, created a new state for peco-only so that the functionality isn't lost. (bugreport:6305)

* ca1eb76:
Char server displaying extra '/' in exp_guild path. (bugreport:7227)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17110 54d463be-8e91-2dee-dedb-b68131a5f0ec