projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea71899 27d6d7a)
Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade'
authorMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:25 +0000 (12:15 -0500)
committerMike Rylander <mrylander@gmail.com>
Thu, 29 Dec 2011 17:15:46 +0000 (12:15 -0500)
One merge conflict in 2.0-2.1-upgrade-db.sql silenced with -X theirs.  See
LP#894052 for details.

Signed-off-by: Mike Rylander <mrylander@gmail.com>

Trivial merge
Evergreen working repo (MassLNC)