Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint
commit3ded3247374d54aed25af4f2651d8fb3fd01b130
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 3 May 2013 13:01:28 +0000 (3 16:01 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 3 May 2013 13:01:28 +0000 (3 16:01 +0300)
treecb4dfd13b5c5f4bee21f5d99482b0dc675296671
parentf051aabb5792932cd8a7ce65561eac13f9b2733a
parenta77781f9fb17efe0f7402ec9789eac5c8575996b
Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint