Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Mon, 7 Jun 2010 20:13:51 +0000 (21:13 +0100)
committerAndrew Flegg <andrew@bleb.org>
Mon, 7 Jun 2010 20:13:51 +0000 (21:13 +0100)
commit1a33601c2c9324def3946e5c2ce2318ba2378a72
tree9d855b44523c39638a38de26b3db61b75fd72143
parent85069198ea8a56160db594fa094c313ce43aecb0
parent16405360cc95f5cc5dd5126e99906f7967439678
Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

package/debian/hermes.postinst
package/src/org/maemo/hermes/engine/linkedin/api.py