merge from trunk
commitc4dfb6946f22b7b02a9df33708cb2b0d71ba21ac
authorJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 21:21:12 +0000 (25 23:21 +0200)
committerJoakim Verona <joakim@verona.se>
Sun, 25 Aug 2013 21:21:12 +0000 (25 23:21 +0200)
treee5924af5de85fa863502270357e7b8e28c55c43f
parent9049c89bd8d5fec8b7bc35298859445350e8679f
parent8a51e842321a59943df63faa97d98a390e22211a
merge from trunk