Merge branch 'rr1-maint'
commit1daca22d811843664cf193d303cab6888245a068
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 8 May 2013 06:38:55 +0000 (8 09:38 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 8 May 2013 06:38:55 +0000 (8 09:38 +0300)
treed4d12d16f92beaa6d79253f9034bf4c58b76445f
parent0b8ab9324cac8a2cea50d974117f3b73f0c3db0b
parent8c4b8e1605c46e1785bbe2533b69dcf9a249c811
Merge branch 'rr1-maint'