Merge lp:~replaceafill/schooltool/schooltool_copyright_year into lp:schooltool/1.7

[Douglas Cerna]

[Gediminas Paulauskas (menesis)]

I would prefer that you committed such trivial changes directly to trunk. A separate branch, merge request, and email to everyone is way too much for a 1 symbol change.

review: Approve

[Douglas Cerna (replaceafill)]

Or I could file a bug and assign it to you? I don't like the idea of messing with trunk. I have had nightmares where I delete trunk! :)

[Gediminas Paulauskas (menesis)]

You have commit rights to trunk, and always have a fresh copy of it.
It would be less work for me if you pushed simple changes directly to
trunk. Feature or bugfix branches are good, I should do my work in
branches more. But some changes just don't deserve a branch or even a
separate commit.

2011/1/26 Douglas Cerna <email address hidden>:
> Or I could file a bug and assign it to you? I don't like the idea of messing with trunk. I have had nightmares where I delete trunk! :)
> --
> https://code.launchpad.net/~replaceafill/schooltool/schooltool_copyright_year/+merge/47311
> You are reviewing the proposed merge of lp:~replaceafill/schooltool/schooltool_copyright_year into lp:schooltool.
>

=== modified file 'src/schooltool/skin/templates/view_macros.pt'
--- src/schooltool/skin/templates/view_macros.pt	2010-09-13 12:05:37 +0000
+++ src/schooltool/skin/templates/view_macros.pt	2011-01-24 20:44:12 +0000
@@ -126,7 +126,7 @@
             use-macro="view/@@schooltool_macros/generic/serverinfo" />
           <br />
           <span i18n:translate="">
-            &copy; The <a href="http://www.shuttleworthfoundation.org">Shuttleworth Foundation</a> 2003 - <span>2010</span>:
+            &copy; The <a href="http://www.shuttleworthfoundation.org">Shuttleworth Foundation</a> 2003 - <span>2011</span>:
             Supporting Social Innovation.
           </span>
         <br />