non-FF merge from master

[Phil Mayers]

On 13/11/12 14:35, Phil Mayers wrote:
> All,
>
> I just had another "update (forced)" pull when I did "get fetch --all"
> on the master branch, followed by a failure to "git merge" onto my local
> master.
>
> As mentioned previously, my "master" branch is pristine, and should be
> unchanged from upstream "master".
>
> Is someone doing "rebase" on master? If so, can I cast a vote for
> "please don't"?
>

The offending commits seem to be:

commit 3efb7720c9cc6e5a9b49459ae7bcfe6bf223fe73
Author: Chris Mikkelson <cmikk at qwest.net>
Date:   Wed Feb 8 13:14:11 2012 -0600

     Handle tagged attributes with multiple values in rlm_perl.

commit e2a40b6eeb09f7c816b9a6aa0b19325ce8594591
Author: Arran Cudbard-Bell <a.cudbardb at freeradius.org>
Date:   Sun Oct 28 11:47:46 2012 +0000

     Add tag matching to pairdelete and paircopy2

...which have changed in the upstream repo at some point. Maybe this was 
actually a result of last time?