merge issue

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2016-08-19 02:05:25
Author local date 2016-08-19 03:05:25 +0100
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2016-08-19 02:05:25
Committer local date 2016-08-19 03:05:25 +0100
Commit 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629
Tree 1ea4937e30520d440979ab02e92882f6f54a3e73
Parent a0538eb53d8d1d08f4bffb2e9502537dbad3f812
Parent e62d38a4abe3d940ef4dedb6c30681a8d58cdf47
merge issue
Affected files:
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
ViewGit