master branch contains all leslie changes

The head of master and leslie should be now identical (leslie rebased onto master)

interesting commits (oldest first):
    * 69cf15 - common ancestor of leslie and master branches (Feb 2012)
    * 550e21 - old master HEAD (Nov 2012)
    * 516b8f - single commit which reverts everything between 69cf15 and 550e21 (revert to common ancestor)
    * 418 commits following 516b8f - rebase of leslie onto master