Merge

2007-07-25 09:57:30 -04:00
parent ba08537dc7 9731a93c3f
commit 36f3056715
3 changed files with 156 additions and 73 deletions
@@ -1,6 +1,8 @@
 * Turn off logging by default.  Logs may be re-enabled on a per-module basis
  by adding environment variables like SHELL_DEBUG and RECORD_DEBUG to
  the sugar environment
+* #2370 Update spanish translation. (marco)
+* #2014 Add icons in the share dropdown in activities. (marco)

 Snapshot 9ac5d38e90