Merge branch 'rr1-maint'
commit53b612265bff7c978dc32067ccbca56fd25477a6
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 6 Dec 2013 05:52:01 +0000 (6 07:52 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 6 Dec 2013 05:52:01 +0000 (6 07:52 +0200)
tree3255b8d8c94aef0d407aa4456caa227c5e70d973
parent76b8349abe9f1fb128a012a076f4184dec9b2dd0
parent56c1282e4857bce50997a166ad830df37e3fb475
Merge branch 'rr1-maint'