Merge branch 'master' of git://git.vireo.org/movein
authorStuart Prescott <stuart+debian@nanonanonano.net>
Thu, 13 Oct 2011 08:17:40 +0000 (09:17 +0100)
committerStuart Prescott <stuart+debian@nanonanonano.net>
Thu, 13 Oct 2011 08:17:40 +0000 (09:17 +0100)
commit9d0455e099d333a521763ebb1cb5ec88b80d54a8
tree2f04d1642fd35a4440dc508a65e59bee0325cd86
parent413df45c2a4b0aebb09fb97f67aa751a99bce3f9
parentee203f1829d19cc02f9b33c24e47e05851471826
Merge branch 'master' of git://git.vireo.org/movein

Conflicts:
movein
          * huge number of whitespace conflicts
movein