fix merge
authorstack <stack@inventati.org>
Sun, 16 Jun 2013 17:36:56 +0000 (19:36 +0200)
committerstack <stack@inventati.org>
Sun, 16 Jun 2013 17:36:56 +0000 (19:36 +0200)
commitbf8352cb84782e000f2b7b831df5a9053d853548
tree9910b73d9539c45e89e64bf43567d358dbfe2a96
parentf7f331ca8166fd8b4a0c56f065d0021f954ee4c5
parent89c94c14cc78f8027edc13750eda23c03a4435b2
fix merge