Merge remote branch 'origin/master'
authorMarius Mathiesen <marius@shortcut.no>
Fri, 27 Aug 2010 11:19:53 +0000 (13:19 +0200)
committerMarius Mathiesen <marius@shortcut.no>
Fri, 27 Aug 2010 11:19:53 +0000 (13:19 +0200)
commitdd8c865a5a34f21d34524ca64f32729601fee836
tree7b12c71b476151bc39846cff9bec972ad85bba20
parent136a77e80689e8f02f94c2811c2b8deaf0b0aed9
parent51c652d7aea1708863ffa903ef20d7ea7e18f543
Merge remote branch 'origin/master'