Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Dec 2011 05:49:12 +0000 (06:49 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 16 Dec 2011 05:49:12 +0000 (06:49 +0100)
commit6ccb79c7d1851ff4dbe48572d49631be9829e726
tree76529c9c300fbc3cd6337192279928e26954acfa
parenteb968b932571cac89ca65ce6d522af369757e17f
parentd5ee5cdea79ab756f4a7908c19b8232d57a1a3a8
Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd