Essentially I have the same problem as Gordon Bateson in his topic CiBoT wants me to do a GIT rebase, but how? However I rebased my branches and even went as far to delete my MDL- branch and recreate it of the latest master.
My master branch is even with moodle:master and you can find it here: github.com/eSrem/moodle
My MDL- branch introducing the fix is 2 commits ahead and you can find it here: https://github.com/eSrem/moodle/commits/MDL-56367
Still CiBoT is telling me the branch is too old. What to do? :D