Merge branch 'rr1-maint'
commit6a0b0dc01b9eceee686f1741bda9e7cca494b66b
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 16 Dec 2012 19:45:53 +0000 (16 21:45 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 16 Dec 2012 19:45:53 +0000 (16 21:45 +0200)
tree68eb0a672745f2f7bf2b65b7dda41b2c6ee65082
parent7b0b39d5364301ea2778b7c9bd63abeb900327f8
parente59f8d469b50c5a7eff668aac7e200200bce7edd
Merge branch 'rr1-maint'