Merge pull request #14 from bnormoyle/master

Fixing the ghanan band
Fixed the d_ghilman mercenary composition
Merge pull request #15 from thefinestsieve/master

Fixed the d_ghilman mercenary composition
Remove erroneous landless c_butanya in d_damietta [save-compatible]

Also removed flag to maintain flag offset consistency
Merge pull request #16 from zijistark/master

Remove erroneous landless c_butanya in d_damietta [save-compatible]
Revert "Remove erroneous landless c_butanya in d_damietta [save-compatible]"

This reverts commit ae9bae2b4626a8def322aca0b3e67ec2c22c8253.
Revert "Revert "Remove erroneous landless c_butanya in d_damietta [save-compatible]""

This is a do-nothing upstream commit, because it un-reverts a commit
that I didn't push.

This reverts commit 9b6e0111a2494e6c5a9f856b4486fe3c21adde75.
Compatching
Merge pull request #19 from Meneth/master

Compatching
Fixing the ghanan band
Fixed the d_ghilman mercenary composition
Remove erroneous landless c_butanya in d_damietta [save-compatible]

Also removed flag to maintain flag offset consistency
Missing holy orders
Title fixes
Merge pull request #20 from Meneth/master

Compatching
Climate fix
Revert "Remove erroneous landless c_butanya in d_damietta [save-compatible]"

This reverts commit ae9bae2b4626a8def322aca0b3e67ec2c22c8253.
Removed Charlemagne bookmark
Revert "Revert "Remove erroneous landless c_butanya in d_damietta [save-compatible]""

This reverts commit c01d1d3cb725b8d86a91b087ac92ccf2f4cec819.
Merge branch 'master' of https://github.com/Meneth/SWMH