merge in 0.8 8069b08e90ac
authorTero Marttila <terom@paivola.fi>
Sun, 01 Mar 2015 18:59:10 +0200
changeset 655 35ff69656be0
parent 652 ae80faacaa21 (diff)
parent 654 8069b08e90ac (current diff)
child 656 9c85815cd04c
merge in 0.8 8069b08e90ac