Merged trunk, fixed conflict.
authorThomi Richards <thomi.richards@canonical.com>
Mon, 2 Dec 2013 05:21:08 +0000 (18:21 +1300)
committerThomi Richards <thomi.richards@canonical.com>
Mon, 2 Dec 2013 05:21:08 +0000 (18:21 +1300)
commita279fbd89bf49237368e6bfd22278e79f56a2372
tree410f2661a989812d0f0aae4861b523db46b3f6d8
parent1ee230bbe58895d769ba5793eae2272b32de10c9
parentd2776fbb08a7edf6c69974586f06888fe94bdff8
Merged trunk, fixed conflict.
Makefile.am
NEWS
setup.py