Merge branch 'master', remote-tracking branch 'upstream/master'
Merge branch 'master', remote-tracking branch 'upstream/master'
added some homepages fields for some packages starting with A and B
Add Qemu Message Protocol (QMP) client
Add obuild.0.0.2
Merge pull request #757 from djs55/obuild.0.0.2

Add obuild.0.0.2
Merge pull request #756 from djs55/qmp.0.9.0

Add Qemu Message Protocol (QMP) client
Merge pull request #755 from blue-prawn/master

some homepages for A and B's
forgot to add tiny_json_conv.1.4.0/url
Merge pull request #758 from camlspotter/pr

forgot to add tiny_json_conv.1.4.0/url
Batteries > 1.5.0 does not provide "estring" anymore.
Merge pull request #759 from Chris00/master

Update batteries conflict