Repository : ssh://git@open-mesh.org/doc

On branches: batman-adv-doc,master

commit c35e097f419bc19c7c6fc082a05a7d9d247dc8e3 Merge: 71ab9edf 84e61f83 Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Jan 5 20:58:51 2009 +0100

Merge branch 'master' of gitorious:batman-adv-doc/mainline

c35e097f419bc19c7c6fc082a05a7d9d247dc8e3 Makefile | 4 ++++ batman.docbook => batman_iv_only.docbook | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)