tree 78be91e796e1a1722967f513f09a90c61080baf2
parent f5174f209ef0b51b1c2fd88713c3dae7b6db3659
parent d21c3a2258092cf6de07370f75632a0e8e51529e
author Wes Hardaker <hardaker@users.sourceforge.net> 1418066322 -0800
committer Wes Hardaker <hardaker@users.sourceforge.net> 1418066322 -0800

Merge branch 'V5-4-patches' into V5-7-patches

Conflicts:
	agent/mibgroup/mibII.h