Merge branch 'rr1-maint'
commit42c56ba7013ded7463ed4bb1f9486f87a96acbc3
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 23 Feb 2012 21:18:48 +0000 (23 23:18 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 23 Feb 2012 21:18:48 +0000 (23 23:18 +0200)
tree8b6fad831e9a08fcf1be5fb91c01ef1784f0ef31
parente4e38740072eb47bd45b21d1f57c96ed8ef19067
parentc5633cc2ea2c333a83debbdd85010b48f78c72fc
Merge branch 'rr1-maint'