]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
commit9ac9fc3d802db666b94cc85175bef2cfbd335ed5
treef99559f134e1b49719a3454405ca2643e6815bce
parent57865e53f70b234f2b1f1be07ed8ca8ef091664b
parent9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
config/rootfiles/packages/asterisk
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
make.sh