Merge branch 'env-cfg'
commitad84fc1dba69a9efb2455595bf66b46011a0c268
authorStefan Kögl <stefan@skoegl.net>
Mon, 8 Jun 2015 14:58:17 +0000 (8 16:58 +0200)
committerStefan Kögl <stefan@skoegl.net>
Mon, 8 Jun 2015 14:58:17 +0000 (8 16:58 +0200)
treea07b08059bdf557ece13cf1dab286a0a64d9de22
parent43aae70010d55b3e3ae216fd238eaf4ce7922ddd
parentf1f666545fabce96e301960b7ccf843a2fd74c29
Merge branch 'env-cfg'