Merge branch 'rr1-maint'
commit8b5b33c422e9dabff7c8e2dfe31e4bf5fc82481e
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 1 Jan 2014 21:49:41 +0000 (1 23:49 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 1 Jan 2014 21:49:41 +0000 (1 23:49 +0200)
treef4c1233855f11c52d527900a5ae869bc8694af1e
parent89a9363e6f2d6df90694ce9b8dea047cea8db139
parentc7bdac819dcc1ab45f150aa50c7cedf907e82d4c
Merge branch 'rr1-maint'