Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar

Conflicts:

	NEWS
This commit is contained in:
Marco Pesenti Gritti
2007-11-09 17:38:09 +01:00
3 changed files with 25 additions and 9 deletions
+2
View File
@@ -1,4 +1,6 @@
* #4687 Use the right free function, fix a crash. (sjoerd)
* #4724 Display meshbox invite palette menu with colored
activity icon (erikos)
* Always checkin to the DS from a new file. (tomeu)
Snapshot c682a5e241