Merge branch 'rr1-maint'
commitc0f19435e41c9bd85b53bcef303da8c37d8b2a6c
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 3 Sep 2013 19:28:14 +0000 (3 22:28 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 3 Sep 2013 19:28:14 +0000 (3 22:28 +0300)
tree307e5b4f1756c17673cead3dd9e3fa091b00f127
parentd0bf4e220a048f070d6fcf12a0302c117cbac241
parent61482629eebfbb7feacae722a552e8bb5e9520a2
Merge branch 'rr1-maint'