Merge branch 'master' into tj-worg
authortj <tj@data-driven.de>
Tue, 12 Mar 2013 01:54:36 +0000 (02:54 +0100)
committertj <tj@data-driven.de>
Tue, 12 Mar 2013 01:54:36 +0000 (02:54 +0100)
Conflicts:
org-contrib/gsoc2012/student-projects/bugpile/i.org


Trivial merge