]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit - src/install+setup/install/main.c
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:47:09 +0000 (21:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:47:09 +0000 (21:47 +0100)
commit9e31e76b8b72325dcaede4d3dfefc4a56d5caa4b
treedbd5ae260820c29d67cd37b22e9f47ec32eee3a8
parent39d36c000a493a12c3ed85d3abf094001e463388
parent6acda73be0ef6c20182a9eb85904a2df3613e9c3
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x