Merge branch 'master' of gitorious.org:git-demo/superapp
authorHenrik Hedberg <hhedberg@innologies.fi>
Mon, 13 Feb 2012 09:47:49 +0000 (11:47 +0200)
committerHenrik Hedberg <hhedberg@innologies.fi>
Mon, 13 Feb 2012 09:47:49 +0000 (11:47 +0200)
commit21e709e8a9631b5da1340350d4ba7cb5d42fb8d8
treea6942d6c2992f1180759254fbc196ec545f50b73
parent3f33b6452f8a91025363ecdd4f60f694483237a4
parentb742c67912a4fd2f6a8c75360c427013b12e8974
Merge branch 'master' of gitorious.org:git-demo/superapp