Merge branch 'config-variables-unification' into 263
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 16:16:29 +0000 (17:16 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 19 Jan 2011 16:16:29 +0000 (17:16 +0100)
commita99b261f6a4a4b1988ce2e0ad4c27ed579378cb9
tree969bca14fb9f28ac36c273600713f0fc683ad67c
parent41f273e53c19541dadfec012034765ae0c3167be
parent67b21d425476471298e0b2e3f5dcacc025ebaaaf
Merge branch 'config-variables-unification' into 263