Merge branch 'master' into shakti/test
authorTuomas Jormola <tj@solitudo.net>
Wed, 21 Nov 2012 23:09:02 +0000 (01:09 +0200)
committerTuomas Jormola <tj@solitudo.net>
Wed, 21 Nov 2012 23:09:02 +0000 (01:09 +0200)
commit870bdfa58af3a2bd2989378fb9d2d1ed3681aff6
tree3a742e4d455e792721d9080e1608736f951a70a3
parent37552b1480d805f4fc5bebc837fcc911352b4bdd
parent351a9ef1bd5144cd5c6d49389e254540d5cdbfed
Merge branch 'master' into shakti/test