Merge branch 'master' into dynconf2
authorLinus Nordberg <linus@nordu.net>
Thu, 12 Apr 2012 18:20:38 +0000 (20:20 +0200)
committerLinus Nordberg <linus@nordu.net>
Thu, 12 Apr 2012 18:20:38 +0000 (20:20 +0200)
commit0b229b06e65ea2d204e32e44fcf26ffd0cfdcc99
treeb7ca53d16153280d6783ff334bca812a5a3bfb3e
parentd293d8bf1099a23e8f962274bc2c13c6e1effcec
parent28e1381a49869874b7fd291b8d82f6a231691dbb
Merge branch 'master' into dynconf2