Merge branch 'rr1-maint' into rr1-gambatte
commitbb0e3732dae6f6651a768d5ff38697b8f56ce349
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 15 Jul 2012 14:39:41 +0000 (15 17:39 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 15 Jul 2012 14:39:41 +0000 (15 17:39 +0300)
tree66a28b387d899638992fc82666829f859fad32c3
parenta1e6d7646da61222371c1c00b13400d574a4d21f
parenta9c02ae58da2bbef1c9fd43153ddb1469cb8cf92
Merge branch 'rr1-maint' into rr1-gambatte