[Denemo-devel] git merge master

[Richard Shann]

Jeremiah,

When I do git merge master from inside the soc branch I get "Already up
to date", which is not the case. Any ideas?
Alternatively can you do it, and then I can just git pull from the soc
branch.

Richard