Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint
commit485558d14898fdf7c4494c9386d95b9814be039d
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 16 Apr 2013 10:55:54 +0000 (16 13:55 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 16 Apr 2013 10:55:54 +0000 (16 13:55 +0300)
tree224313dce60d70b559459d753e702f4f7c052606
parent3c3d3051b33d96331213a1a93ac77e85ce7f670b
parent3ab8f196ec5fa4c756b40786bd2232e8c36e2d1d
Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint