Merge branch 'rr1-maint'
commit6494536334e1af44ed2f2a0deff02122247df73d
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 10 Apr 2013 10:46:25 +0000 (10 13:46 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 10 Apr 2013 10:46:25 +0000 (10 13:46 +0300)
tree74406c32b2827aac0df0ab4a8f6e74fe65ad032a
parent1d9fdedbb3bbdb7a759038d92d89e2431f317c93
parentf32e59391217f7ab2ddeaf31edc1917b70c924d8
Merge branch 'rr1-maint'