just keeping track of last merge commit
just keeping track of last merge commit

git-svn-id: 9f30ac56685387a8341d07574f7f77ec7475fcd6@613580 13f79535-47bb-0310-9956-ffa450edef68

darranl/directory-shared