Merge branch 'master' of ssh://repo.or.cz/srv/git/cl-devil
authorJulian Squires <julian@cipht.net>
Wed, 13 May 2009 21:44:05 +0000 (17:44 -0400)
committerJulian Squires <julian@cipht.net>
Wed, 13 May 2009 21:44:05 +0000 (17:44 -0400)
commit6126f9cc8e10ea10dac3a4e13dff4d3c973c2b16
treee47f6c547dd8a0731f45c31e3586fdb6f2d8516d
parentd21c023333221b5a3090d8d7b4cd0b251073dacf
parenteda6f192738a92f6ee3ee7876b2a0b841afa3185
Merge branch 'master' of ssh://repo.or.cz/srv/git/cl-devil