Bastard merge
authorDavid Sharpe <decoydavid@gmail.com>
Sun, 11 May 2014 19:59:04 +0000 (21:59 +0200)
committerDavid Sharpe <decoydavid@gmail.com>
Sun, 11 May 2014 19:59:04 +0000 (21:59 +0200)
commitd9ded620200ed74517f17f83f01313470ffca222
tree9f8c4ade160c7d065c07fb465a3a10706335a238
parente84353ad1fdf7551807424ab20c138db333684fc
parent4e27b4e10d7fd4f66097ece17a8c51b80233a363
Bastard merge
naja/scenes/credits.py
naja/scenes/credits.py.orig