]> git.sur5r.net Git - ngadmin/commit
Merge branch 'autotools'
authordarkcoven <admin@darkcoven.tk>
Fri, 11 Oct 2013 19:48:29 +0000 (21:48 +0200)
committerdarkcoven <admin@darkcoven.tk>
Fri, 11 Oct 2013 19:48:29 +0000 (21:48 +0200)
commitce846b1344839e09f7c272c2ba2d5259a891892a
tree60365ec096c9f56871fbe3ac649a6dd16d5c48a6
parent5b6cf83fc4d11e65d212975bb1e2504dbf9125cb
parente7b42a7a483fbb8a6a78ed65096788f64eda8301
Merge branch 'autotools'

Conflicts:
cli/src/admin.c
cli/src/admin.c
cli/src/com_vlan.c