Merge branch 'master' of marples:/var/git/openresolv
authorRoy Marples <roy@marples.name>
Wed, 28 Nov 2007 13:01:40 +0000 (13:01 +0000)
committerRoy Marples <roy@marples.name>
Wed, 28 Nov 2007 13:01:40 +0000 (13:01 +0000)
commitf8d4d20b5c4e8d599d10e17fc9d52bf70d4fe1ac
tree3b4a700fef62873fdd09735b86c6918b49ec594d
parent1b21a182cc97ee90e437e0b2a230da1da05de816
Merge branch 'master' of marples:/var/git/openresolv