@Unkle Nuke has completed the merging of the various branches of Mangos Zero server and database repos and I'd like to express my gratitude for his work on that as it was not an easy task.
You might want to re-clone your repos to ensure that you now have the latest changes !!
He is now turning his attention to Mangos One and Two to perform his magic there too !!