Merge branch 'master' of git@83.233.175.44:hermes
authorAndrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
committerAndrew Flegg <andrew@bleb.org>
Tue, 8 Jun 2010 23:06:32 +0000 (00:06 +0100)
commit29ce85c325646c519f25c9dcfb6245cffbe1e5e3
tree1ab425b0c02ee313b73bd07d6875fff8dfc4fd62
parenteccc132a8247f103ba6c14ee05b72ad333349b95
parent88e6635a0aecb0841e57b67badade6da391eb8ae
Merge branch 'master' of git@83.233.175.44:hermes

Conflicts:

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