Merge branch 'rr1-maint'
commit4a482d22c142a3d3de1e7e20e4896d5fea19e2b8
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 14 Apr 2013 17:43:46 +0000 (14 20:43 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 14 Apr 2013 17:43:46 +0000 (14 20:43 +0300)
treeb49ce65288060ba421989c4842e358f75deba902
parentb53f6473156902c0528f4eb5c5d9df38af8ded81
parentc75596f7e4a06b1417b86528f24e19708ec3ef86
Merge branch 'rr1-maint'