Merge branch 'dev-0.2'
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>
Thu, 21 Feb 2013 17:38:56 +0000 (19:38 +0200)
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>
Thu, 21 Feb 2013 17:38:56 +0000 (19:38 +0200)
commit5442e690f65fd09e7a44437da02fb7e14af6fe8f
treeecb8e53aec39dc51f6160d1664e4e50cd4996e64
parent5b536d40a11edb3161f2f19609c2b51899c354b0
parent80a2d33fa9a835564b44fe97ba34e713901cf4fb
Merge branch 'dev-0.2'