Merge remote-tracking branch 'maja/master'
authorLinus Nordberg <linus@nordu.net>
Thu, 22 Dec 2011 09:04:24 +0000 (10:04 +0100)
committerLinus Nordberg <linus@nordu.net>
Thu, 22 Dec 2011 09:04:24 +0000 (10:04 +0100)
commit68d851156019f743618b39d31f7674981ed18a71
tree138003319a37bba2e64cb5d0ba5c898798cb7c71
parentd7ffa5730f6fd4fe9ac9c6e3db224d5d93ef71a5
parent2c70584384ab70cb28477dc9c8fb2179b293fe88
Merge remote-tracking branch 'maja/master'