Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint
commitd1c8435fa22152565ce684af87642d5c603fd720
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 10 May 2013 10:31:57 +0000 (10 13:31 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 10 May 2013 10:31:57 +0000 (10 13:31 +0300)
tree8f4a119f3d17edbb02d64b110e2876db7be089ca
parent96c1f417c5c8e98b2253c238d5789d2ca5606554
parent8c4b8e1605c46e1785bbe2533b69dcf9a249c811
Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint