Merge branch 'rr1-maint'
commit92093e70629073c2e61ff94be257203aa2a49c8a
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 24 Sep 2013 10:37:24 +0000 (24 13:37 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Tue, 24 Sep 2013 10:37:24 +0000 (24 13:37 +0300)
tree0b0edcd140227edd33b6357aba80db788877e4d7
parent5568de778cbb5b76c62cc0c1135d13750d96efe9
parent8301de15b26a40a4e3ac818556c38e19fbe91e1e
Merge branch 'rr1-maint'