[TJ 3.x] 0e6dd569b2c62a016ade16205624b04385da94c2 Merge branch 'master' of ssh://office.taskjuggler.org/srv/www/vhosts/www.taskjuggler.org/htdocs/git-repos/taskjuggler3

[Chris Schlaeger]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "TaskJuggler 3.x - The next generation".

The branch, master has been updated
via 0e6dd569b2c62a016ade16205624b04385da94c2 (commit)
via eeb7a1c214af48ea1349d91a051ebd26db744579 (commit)
from b4dbba67573eae54505d865525428f9e795251cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e6dd569b2c62a016ade16205624b04385da94c2
Merge: eeb7a1c214af48ea1349d91a051ebd26db744579 b4dbba67573eae54505d865525428f9e795251cd
Author: Chris Schlaeger <ch...@linux.com>
Date: Sun Jan 6 13:49:32 2013 +0100

Merge branch 'master' of ssh://office.taskjuggler.org/srv/www/vhosts/www.taskjuggler.org/htdocs/git-repos/taskjuggler3

commit eeb7a1c214af48ea1349d91a051ebd26db744579
Author: Chris Schlaeger <ch...@linux.com>
Date: Sun Jan 6 13:48:33 2013 +0100

Fix: Adding missing 'turnover' to 'columnid' documentation.

-----------------------------------------------------------------------

Summary of changes:
lib/taskjuggler/TjpSyntaxRules.rb | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
For Details see
http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler3.git&a=commitdiff&h=eeb7a1c214af48ea1349d91a051ebd26db744579


hooks/post-receive
--
TaskJuggler 3.x - The next generation