merge of '7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9'

and 'a5e05418d31b07428c4bc802d353b27d6d34ecab'

Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Parent: a5e05418d31b07428c4bc802d353b27d6d34ecab
Monotone-Revision: ebefc72cf1f85cf9726bac12a387a3b5d92e0945

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-01T13:42:18
This commit is contained in:
Francis Lachapelle
2012-05-01 13:42:18 +00:00
4 changed files with 14 additions and 2 deletions
@@ -1,6 +1,6 @@
/*
Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2007-2009 Inverse inc.
Copyright (C) 2007-2012 Inverse inc.
This file is part of OpenGroupware.org.