restored network_set_allowed_peers method that got lost in some earlier manual merging
Merge branch 'master' of https://github.com/BitShares/bitshares_toolkit
Add include for std::array to get windows build to compile.
Fix includes for compiling the bitcoin import stub used when berkeley db
is not available
Fix bad cast from int to time_point_sec
Parse user-agent string for both inbound and outbound connections
Fix display of git revision number in network_get_peer_info output
Fix typo
print usage on cli parse error #117
cap incoming message sizes
Update fc submodule
Revert "print usage on cli parse error #117"

This reverts commit a3dd5c677fd3722a17b49e610cbbc448db7ed1f4.
patch up the bitshares_client_tests to slightly almost sort of work for one test at least
Print command usage in CLI when error parsing arguments (resolves #117)
Merge pull request #142 from vikramrajkumar/master

Fix #117
Merge pull request #54 from BitShares/master

Merge from Remote:BitShares