Merge branch 'rr1-maint' into rr1-gambatte
commit06819fe9abfab58b535b9b98c9bc8e6623a79eab
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 Aug 2012 21:07:40 +0000 (30 00:07 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 29 Aug 2012 21:07:40 +0000 (30 00:07 +0300)
tree3bbd36e505d9b218fa00b02fc587185842a92a0a
parent03338e498bc0158b914ec293dd844f9f3bbda3a2
parent16cfc0b497e3feb7da5ca982924c8e4a0cb2e155
Merge branch 'rr1-maint' into rr1-gambatte