Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 May 2013 17:02:45 +0000 (19:02 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 15 May 2013 17:02:45 +0000 (19:02 +0200)
commita7005f8bc73cb857489acd07b8a792d6cf2ecff7
tree4d5df3d76d1bb037af2ef2f33a03671358e9d68d
parent2e4f9e9f04c812d39db0c247aa956af7aab8b102
parent2d6d9b367124748b98ae650d5e5b4f227b5f2339
Merge remote branch 'origin/master' into import-gui

Conflicts:
src/ui/gui/page-assistant.c