Merge remote-tracking branch 'jiweigert/updxlrtr_sources' into core68
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:37:08 +0000 (16:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 8 Mar 2013 15:37:08 +0000 (16:37 +0100)
1  2 
config/updxlrator/updxlrator

Simple merge