Merge branches 'model-reorg' and 'master' of ssh://goatse.co.uk/~bobtfish/public_html...
authorTomas Doran <bobtfish@bobtfish.net>
Mon, 2 Nov 2009 20:15:59 +0000 (20:15 +0000)
committerTomas Doran <bobtfish@bobtfish.net>
Mon, 2 Nov 2009 20:15:59 +0000 (20:15 +0000)
commit6269ce54da5436773ae96489e027c50231f67f67
treea09f63356d7302a0cbd005aea3feeddafc78c702
parent12b412adaca49734abcd552c76aa9c9925d93c83
Merge branches 'model-reorg' and 'master' of ssh://goatse.co.uk/~bobtfish/public_html/Gitalist/ into model-reorg

* 'model-reorg' of ssh://goatse.co.uk/~bobtfish/public_html/Gitalist/:
  Unfuck things

* 'master' of ssh://goatse.co.uk/~bobtfish/public_html/Gitalist/: