Merge branch 'rr1-maint' into rr1-gambatte
commitc373f47de34383bdbb4bce1baa51bbe51a3e44c4
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 17 Jul 2012 11:52:25 +0000 (17 14:52 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 17 Jul 2012 11:52:25 +0000 (17 14:52 +0300)
tree77d581d26d1c72d0cd8d7e34f2592f6ffb989a2d
parentab47d0011a5392820600158058d7251c185929d5
parentf05caedcbe66810139be5ac3633f0840f80dbffd
Merge branch 'rr1-maint' into rr1-gambatte