Merge branch 'software-vars'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 23:22:13 +0000 (01:22 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 23:22:13 +0000 (01:22 +0200)
commitc20673837939e0bf8694a9cc5895a1b9e8f2598c
treeae63edf6cb517cd212eb64fb401660a59cdf77ba
parentfa6374eb01639b1f25e5de04b48e1889603285ea
parentc5c9ca49f60126e2ae9892fe5eaaca8457665cea
Merge branch 'software-vars'