Merge branch 'rr1-maint'
commit4967dc8264bde7d2b6e8a89f168c541b15ac3627
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 20 Feb 2012 19:21:15 +0000 (20 21:21 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Mon, 20 Feb 2012 19:21:15 +0000 (20 21:21 +0200)
tree8c366d74ffe7b564ff87783d9ef10ffb15cc1cb8
parent7d19748ed25039bd1643705840aa4936caf18071
parentb3e81054f377a11533cc8aeee2d3d12371697184
Merge branch 'rr1-maint'