Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 21:44:42 +0000 (22:44 +0100)
committerAndrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 21:44:42 +0000 (22:44 +0100)
commit75534a6f48de4055068ecfbbecab981b3f872103
treeefb25f3afd3717b7d31e11c3328b408eccdfe75e
parent354621d9b92f04dff1a036c9ee4b104b9e2682f5
parent0d27019b1b54a2c8d0de690fec9cc8f54b621f63
Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

package/src/org/maemo/hermes/engine/hermes.py
package/src/org/maemo/hermes/engine/facebook/service.py
package/src/org/maemo/hermes/engine/hermes.py
package/src/org/maemo/hermes/engine/service.py