[trac-tracnav-plugin/el6/master: 5/5] Merge branch 'master' into el6

[Thomas Moschny]

commit 00a88d7262d94f856bb71c331e5b23b0ab870d92
Merge: 1f442a1 ee7dd64
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Jan 7 00:59:39 2011 +0100

    Merge branch 'master' into el6

 trac-tracnav-plugin.spec           |   11 +++++-
 tracnav-4.1-trac-0.12-compat.patch |   66 ++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 1 deletions(-)
---