changeset 4768:235bb30c9bd6

Groups 2009: merge with the 1.9 branch
author Dmitrijs Milajevs <dimazest@gmail.com>
date Tue, 26 May 2009 16:48:21 +0200
parents 3b34bbd60dca (current diff) 70c8457d68ab (diff)
children 55c40ed9dac1
files
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/account/homepage.py	Tue May 26 16:33:52 2009 +0200
+++ b/MoinMoin/script/account/homepage.py	Tue May 26 16:48:21 2009 +0200
@@ -31,7 +31,7 @@
 give the --group page argument. Or with --all-users you create homepages for ALL users.
 2. To respect ACLs  give the --user argument.
 3. Optionally you may want to use a template page by the --template_page argument.
-With e.g. #acl @ME@:read,write,delete,revert Default on the template page you can define 
+With e.g. #acl @ME@:read,write,delete,revert Default on the template page you can define
 acl rights for the user. @EMAIL@ becomes expanded to the users obfuscated mail address.
 """
 
--- a/contrib/googleimport/googlepush.py	Tue May 26 16:33:52 2009 +0200
+++ b/contrib/googleimport/googlepush.py	Tue May 26 16:48:21 2009 +0200
@@ -1,8 +1,7 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
 
 # needs darcs.idyll.org/~t/projects/twill-latest.tar.gz
 
-
 import sys
 from textwrap import wrap