Merge remote-tracking branch 'origin/master'
commitf6102a69ae40d252201d59c8fc101d87e1634b11
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 9 Jan 2013 10:13:43 +0000 (9 12:13 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 9 Jan 2013 10:13:43 +0000 (9 12:13 +0200)
tree526042d063d06358b6dc7d4fc6d77f88995700a2
parenta7fa16556fe750504244a310233caa1ccb544487
parent63801f39c2eee75928cc41489569413dc44c0d7a
Merge remote-tracking branch 'origin/master'