Merge branch 'rr1-maint' into rr1-gambatte
commit9bc8db6f40adcdc75c17dfea141a4df53eec0abf
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 Aug 2012 14:26:24 +0000 (29 17:26 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 Aug 2012 14:26:24 +0000 (29 17:26 +0300)
tree59b938b4b433d6c932cda76a8b145a869d0c952b
parent26c20df423537767697d36b18dfb2da1da2bc091
parent54172ebc5f27101ef5073356b32603fbfdc514e3
Merge branch 'rr1-maint' into rr1-gambatte