| commit | a65f1eb9065d78fcd0b4871782bbe008b5f8ab7b | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:19 2013 +0100 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:19 2013 +0100 |
| tree | eab2b23c5f9585280da31e64510b286c6c259286 | |
| parent | 0a6f850d9a4e53950cd89cfec5c91a5a082ed7af [diff] | |
| parent | e4a74f9b9b76fc841e431123d91abcb5259ac747 [diff] |
Merge remote-tracking branch 'kristi/master'