Merge commit 'lsnes-rr1'
commit622abffc22bdc63cb018eb13fc2a00d42bae1a3b
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 22 Jan 2012 23:41:15 +0000 (23 01:41 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 22 Jan 2012 23:41:15 +0000 (23 01:41 +0200)
tree9f64d713ab6c84f6ef69b89f1ec698f30f54cbf8
parent685031466235361c01e3407bc772d51929630341
parentd12207b0f470df82b9ab8bc2c9f638b6c55d3359
Merge commit 'lsnes-rr1'