Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 21:38:54 +0000 (22:38 +0100)
committerAndrew Flegg <andrew@bleb.org>
Wed, 9 Jun 2010 21:38:54 +0000 (22:38 +0100)
commit1baaea336a8784a1bbbf399f4e711832d1149399
treec495f5b81d0551139ebcd33039fbfe9e9ff49c20
parent38be8f71dea8eef2db16a30959fde91b766623d4
parentdb4af5f07dc69300c32a4a837123b9f03ff1f7dd
Merge branch 'master' of git@83.233.175.44:hermes
package/src/org/maemo/hermes/engine/friend.py
package/src/org/maemo/hermes/engine/hermes.py