git-svn-id: https://jules.scsys.co.uk/repository/shadowcat-code/scratchpad/matthewt/sig/lib@1301
8a6f57db-631f-0410-b083-dc7c4259d016
using the time honoured technique of copying everything he
wanted to merge over the top of what he wanted to merge it to
and then commiting.
+%
+12:34 < mst> melo: but that would just make me cry :(
+12:34 < melo> cry, baby, cry… :)
+12:35 * mst leans up in the pram and throws his toys at melo's head
+12:36 < melo> mst: foreplay at this time in the morning?