Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint
commit056da2aaa3e3a510ae44b7f5d924cc502a56ad72
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 6 Mar 2012 11:50:15 +0000 (6 13:50 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 6 Mar 2012 11:50:15 +0000 (6 13:50 +0200)
treefd55f4c6d3195cf873c05ef3706eed611a446b5b
parent44233e3897d3c85308b77aad4ad60b0dc94f6670
parent947fe5fc42398b7e65b8c68e87440b9fe57b2059
Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint