Merge branch 'no-edges2'
authorJoris Mooij <jorism@marvin.jorismooij.nl>
Mon, 8 Sep 2008 14:18:16 +0000 (16:18 +0200)
committerJoris Mooij <jorism@marvin.jorismooij.nl>
Mon, 8 Sep 2008 14:18:16 +0000 (16:18 +0200)
commit8451d8902f5b9d388f9e8d9209f8e6062bfe9842
treee66395a41aaad3635585b318069db72d6f0ee8fc
parentf098f650b45f2652d660c99f66df7b627214edbc
parent7e77161d381c0062fb7159276d09633a0cce6a63
Merge branch 'no-edges2'