merging refs/remotes/origin/master into HEAD
authormorty <morty@gmx.net>
Sun, 16 Jan 2011 15:38:48 +0000 (16:38 +0100)
committermorty <morty@gmx.net>
Sun, 16 Jan 2011 15:38:48 +0000 (16:38 +0100)
commit623e3f9893f2f8b0046cfcb1fedc17486b2f0b39
treed2bb71a482c79b943784cdcbf4a8416b088a106a
parent520de78a4405c4f052aae367d39d80045862f322
parent25aefd979b1cb846dfc2b5b1205866efec928595
merging refs/remotes/origin/master into HEAD