Merge branch 'rr1-maint'
commit089602bd77d9d06accc6cd1a5b1916882de0738a
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 3 May 2013 13:02:37 +0000 (3 16:02 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 3 May 2013 13:02:37 +0000 (3 16:02 +0300)
tree30e5c4addba5b9c3b9404aa902a269c203633b60
parent9a1cbc2207766126bb2d7107900c746fa70fd03c
parent3ded3247374d54aed25af4f2651d8fb3fd01b130
Merge branch 'rr1-maint'