]> git.defcon.no Git - test-repo/commit
Merge http://git.defcon.no/test-repo
authorJon Langseth <jon.langseth@lilug.no>
Thu, 2 Dec 2010 19:55:57 +0000 (20:55 +0100)
committerJon Langseth <jon.langseth@lilug.no>
Thu, 2 Dec 2010 19:55:57 +0000 (20:55 +0100)
commit9098c6e71672b765269c2e70c2c9a8a666458b52
tree48edf53249887666999a60bb336516f8dd9e0713
parent704fcbb57ec5ee5c4675641179f7d76e7c6b2ff9
parent28f79c4186e1b54ac7f6a4fea48f5eb28c27b1fd
Merge http://git.defcon.no/test-repo

Conflicts:
fil
fil