Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint
commit1297f683e077f958a027777b19bdfda42e518e4d
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 25 Jan 2013 10:35:01 +0000 (25 12:35 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 25 Jan 2013 10:35:01 +0000 (25 12:35 +0200)
treef9efd554e7817a1f0459aa6db9f55efbe99ff9b9
parenta116622b327292df748319399c35eba29ff893b7
parentc168be8562378b9ee3481947994374d6c316c764
Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint