developer-new-2012-07-09-3

gistfile1.txt

commit fc9837dcd6704792b1766d3ea7497db6aa11dc27
Merge: 07effbc aed4e11
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 13:20:46 2012 -0700

    Merge pull request #368 from ubernostrum/dekiuser-dupe-hackaround
    
    Work around duplicate migrated deki users.

commit aed4e1146a0d002f3b504d8f33a9696bdc11e2eb
Author: James Bennett <james@b-list.org>
Date:   Mon Jul 9 15:16:35 2012 -0500

    Work around duplicate migrated deki users.
    
    This is at best a temporary hack to get migration working again; it
    simply changes out the get() call for filter(), and automatically
    picks the first user returned. This may result in a need to fix
    objects associated with a second account, but since currently the
    migration blows up when attempting to call this method, hopefully it's
    not been possible to create any such objects.

commit 07effbcbce259494cc606669bb5e4cfc4837f991
Merge: 87e1925 4ddb10f
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 11:42:53 2012 -0700

    Merge pull request #363 from groovecoder/clean-documenttags-763498
    
    fix bug 763498 - clean up document tags with dupe names

commit 4ddb10f24a35945a69f9f3c2bfc6581169b0ced5
Author: groovecoder <luke.crouch@gmail.com>
Date:   Sun Jul 8 10:57:31 2012 -0500

    fix bug 763498 - clean up document tags with dupe names