diff options
| author | ivan <ivan> | 2008-03-02 04:11:51 +0000 | 
|---|---|---|
| committer | ivan <ivan> | 2008-03-02 04:11:51 +0000 | 
| commit | c648976f0b7975f2328ebd7ba8c711fad0ca4195 (patch) | |
| tree | f3d176ec300a46c253ba25a988b897bce02fe174 /rt/html/REST/1.0/ticket/merge | |
| parent | 5e05724a635a22776f1b973f5d7e77989da4e048 (diff) | |
| parent | 8103c1fc1b2c27a6855feadf26f91b980a54bc52 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r6255,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/html/REST/1.0/ticket/merge')
| -rw-r--r-- | rt/html/REST/1.0/ticket/merge | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/rt/html/REST/1.0/ticket/merge b/rt/html/REST/1.0/ticket/merge index 3db52111b..d6ae96f83 100644 --- a/rt/html/REST/1.0/ticket/merge +++ b/rt/html/REST/1.0/ticket/merge @@ -2,7 +2,7 @@  %#   %# COPYRIGHT:  %#   -%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC  +%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC   %#                                          <jesse@bestpractical.com>  %#   %# (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@  %#   %# You should have received a copy of the GNU General Public License  %# along with this program; if not, write to the Free Software -%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/copyleft/gpl.html.  %#   %#   %# CONTRIBUTION SUBMISSION POLICY: | 
