Merge branch 'master' of gitorious.org:git-demo/superapp master
authorHenrik Hedberg <hhedberg@innologies.fi>
Mon, 13 Feb 2012 09:55:52 +0000 (11:55 +0200)
committerHenrik Hedberg <hhedberg@innologies.fi>
Mon, 13 Feb 2012 09:55:52 +0000 (11:55 +0200)
commit5afd394c9d8db276573d9a27cc686594d4b3d249
treee9febc9434d29f35fa90d3647e7012a2f6e5a28b
parent55a0d2af578aca76b03bdb5c61833f9e13ed1f35
parenta01c007941734d344745bd8b1e63b8ec1fa970d0
Merge branch 'master' of gitorious.org:git-demo/superapp

Conflicts:
main.c
main.c