From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Mon, 12 Dec 2011 17:53:03 +0000 (+0100)
Subject: Merge branch 'sql/dot-notation'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d44140a212fddab3301cbf3a97d3197f8879277b;p=mediagoblin.git

Merge branch 'sql/dot-notation'

* sql/dot-notation:
  Dot-Notation for MediaEntry.media_data
  Dot-Notation for MediaEntry.media_type
  Dot-Notation for MediaEntry.description(_html)
  Dot-Notation for MediaEntry.slug
  Dot-Notation for MediaEntry.title
  Dot-Notation for MediaEntry.uploader
  Dot-Notation for MediaEntry.created
  Dot-Notation: tests/test_edit.py
  Dot-Notation for Users.fp_token_expire
  Dot-Notation for Users.fp_verification_key
  Dot-Notation for Users.bio and .bio_html
  Dot-Notation for Users.url
  Dot-Notation for Users.is_admin
  Dot-Notation for Users.verification_key
  Dot-Notation for Users.status
  Dot-Notation for Users.email_verified
  Dot-Notation for Users.pw_hash
  Dot-Notation for Users.email
  Dot-Notation for Users.username
---

d44140a212fddab3301cbf3a97d3197f8879277b