Merge branch 'master' of github.com:benjaoming/django-wiki

README.md

 django-wiki
 ===========
 
+***News: March 26, 2013***
+
+Thanks to TomLottermann for German translation and daltonmatos for Brazilian translations! French are also reported in the works. 0.0.18 is released with that plus Django 1.5 compatibility, and [a bunch of other things and fixes](https://groups.google.com/forum/#!topic/django-wiki/V-bZou8aTaI).
+
 ***News: February 21, 2013***
 
 New release adds email notifications to django_notify, improved [toc] tag and bootstrap typography.
@@ -200,4 +204,4 @@ Support
 
 This project is already alive and will remain alive, because it's free software and as long as it's essential, common interest will keep it alive... we hope :) You're more than welcome to help build benjaoming's economical independency which in turn will be used to create free software.
 
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=benjaoming&url=https://github.com/benjaoming/django-wiki/&title=django-wiki&language=&tags=github&category=software) 
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=benjaoming&url=https://github.com/benjaoming/django-wiki/&title=django-wiki&language=&tags=github&category=software) 
\ No newline at end of file

wiki/admin.py

@@ -26,7 +26,7 @@ class ArticleRevisionForm(forms.ModelForm):
 
 class ArticleRevisionAdmin(admin.ModelAdmin):
     form = ArticleRevisionForm
-    display_list = ('title', 'created', 'modified', 'user', 'ip_address')
+    list_display = ('title', 'created', 'modified', 'user', 'ip_address')
     class Media:
         js = editors.getEditorClass().AdminMedia.js
         css = editors.getEditorClass().AdminMedia.css